update unicorn [ci skip]
This commit is contained in:
parent
a3e13e3c0e
commit
c301f80ca9
2 changed files with 6 additions and 6 deletions
2
Gemfile
2
Gemfile
|
|
@ -40,7 +40,7 @@ end
|
||||||
|
|
||||||
group :heroku do
|
group :heroku do
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
gem 'unicorn', '~> 4.1.1', :require => false
|
gem 'unicorn', '~> 4.2.0', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
gem 'settingslogic', :git => 'git://github.com/binarylogic/settingslogic.git'
|
gem 'settingslogic', :git => 'git://github.com/binarylogic/settingslogic.git'
|
||||||
|
|
|
||||||
10
Gemfile.lock
10
Gemfile.lock
|
|
@ -221,7 +221,7 @@ GEM
|
||||||
multi_json
|
multi_json
|
||||||
jwt (0.1.4)
|
jwt (0.1.4)
|
||||||
json (>= 1.2.4)
|
json (>= 1.2.4)
|
||||||
kgio (2.7.0)
|
kgio (2.7.2)
|
||||||
launchy (2.0.3)
|
launchy (2.0.3)
|
||||||
linecache (0.46)
|
linecache (0.46)
|
||||||
rbx-require-relative (> 0.0.4)
|
rbx-require-relative (> 0.0.4)
|
||||||
|
|
@ -406,10 +406,10 @@ GEM
|
||||||
typhoeus (0.3.3)
|
typhoeus (0.3.3)
|
||||||
mime-types
|
mime-types
|
||||||
tzinfo (0.3.31)
|
tzinfo (0.3.31)
|
||||||
unicorn (4.1.1)
|
unicorn (4.2.0)
|
||||||
kgio (~> 2.4)
|
kgio (~> 2.6)
|
||||||
rack
|
rack
|
||||||
raindrops (~> 0.6)
|
raindrops (~> 0.7)
|
||||||
vegas (0.1.11)
|
vegas (0.1.11)
|
||||||
warden (1.0.6)
|
warden (1.0.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
|
@ -514,7 +514,7 @@ DEPENDENCIES
|
||||||
timecop
|
timecop
|
||||||
twitter (= 2.0.2)
|
twitter (= 2.0.2)
|
||||||
typhoeus
|
typhoeus
|
||||||
unicorn (~> 4.1.1)
|
unicorn (~> 4.2.0)
|
||||||
webmock
|
webmock
|
||||||
whenever
|
whenever
|
||||||
will_paginate
|
will_paginate
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue