diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 586b7bda61b..ac217c2e2da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -244,7 +244,6 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.8.0) launchy (2.1.2) addressable (~> 2.3) letter_opener (1.0.0) @@ -304,6 +303,8 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) + puma (2.0.0.b7) + rack (>= 1.1, < 2.0) pygments.rb (0.4.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) @@ -351,7 +352,6 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.10.0) rake (10.0.4) rb-fsevent (0.9.2) rb-inotify (0.8.8) @@ -480,10 +480,6 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - unicorn (4.6.2) - kgio (~> 2.6) - rack - raindrops (~> 0.7) useragent (0.4.16) virtus (0.5.4) backports (~> 2.6.1) @@ -558,6 +554,7 @@ DEPENDENCIES pg poltergeist (= 1.1.0) pry + puma (~> 2.0.0.b7) quiet_assets (~> 1.0.1) rack-mini-profiler rails (= 3.2.13) @@ -588,5 +585,4 @@ DEPENDENCIES therubyracer thin uglifier (~> 1.3.0) - unicorn webmock |