Update ruby version and add unicorn to Gemfile

a-chernykh · Jan 4, 2015 · d39ff6d · d39ff6d
1 parent c798f15
commit d39ff6d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.2
+2.2.0
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 source 'https://rails-assets.org'
 
+ruby '2.2.0'
+
 gem 'rails', '4.2'
 
 gem 'pg'
@@ -22,6 +24,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'tilt'
 gem 'rubyzip', require: 'zip'
 
+gem 'unicorn'
+
 group :development do
   gem 'spring'
   gem 'quiet_assets'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -104,6 +104,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    kgio (2.9.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     listen (2.8.4)
@@ -163,6 +164,7 @@ GEM
       activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    raindrops (0.13.0)
     rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
@@ -232,6 +234,10 @@ GEM
     uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -268,3 +274,4 @@ DEPENDENCIES
   terminal-notifier-guard
   tilt
   uglifier (>= 1.3.0)
+  unicorn