aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 2 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ee40de7..e7fe235 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,7 +84,6 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
- daemons (1.2.3)
em-hiredis (0.3.0)
eventmachine (~> 1.0)
hiredis (~> 0.5.0)
@@ -117,6 +116,7 @@ GEM
mysql2 (0.4.2)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
+ puma (2.15.3)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (2.0.0.alpha)
@@ -171,10 +171,6 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- thin (1.6.2)
- daemons (>= 1.0.9)
- eventmachine (>= 1.0.0)
- rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
@@ -198,13 +194,13 @@ DEPENDENCIES
haml
jquery-rails
mysql2 (>= 0.3.18, < 0.5)
+ puma
quiet_assets
rails (>= 5.0.0.beta1, < 5.1)
sass-rails
sinatra
sprockets
sprockets-es6
- thin
uglifier (>= 1.3.0)
BUNDLED WITH