From 54016a8ee94d77c487b72afebd07d30aedf8822f Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Sun, 11 Jan 2015 09:16:31 +0100 Subject: [PATCH] replaced thin with puma --- Gemfile | 2 +- Gemfile.lock | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 6ee4f7e4..1b62b2e9 100644 --- a/Gemfile +++ b/Gemfile @@ -5,4 +5,4 @@ source 'https://rubygems.org' gem 'rack-rewrite' gem 'sinatra' gem 'sinatra-param' -gem 'thin' +gem 'puma' diff --git a/Gemfile.lock b/Gemfile.lock index d966d436..7a136649 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,25 @@ GEM remote: https://rubygems.org/ specs: - daemons (1.1.9) - eventmachine (1.0.3) - rack (1.5.2) + puma (2.10.2) + rack (>= 1.1, < 2.0) + rack (1.6.0) rack-protection (1.5.3) rack - rack-rewrite (1.5.0) + rack-rewrite (1.5.1) sinatra (1.4.5) rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) sinatra-param (1.2.2) sinatra (~> 1.3) - thin (1.6.3) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) - rack (~> 1.0) tilt (1.4.1) PLATFORMS ruby DEPENDENCIES + puma rack-rewrite sinatra sinatra-param - thin