ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-28 13:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump rails and puma versions

Browse source
This commit is contained in:
Luke Barratt 2014-08-10 18:21:53 +01:00
parent 4c79ac4a75
commit 277e660717
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile
View file

@ -3,10 +3,10 @@ source 'http://rubygems.org'
ruby '2.1.2'
gem 'dotenv-rails', '~> 0.10.0'
gem 'rails', '~> 3.2.18'
gem 'rails', '~> 3.2.19'
gem 'mysql2', '~> 0.3.15'
gem 'dalli', '~> 2.7.0'
gem 'puma', '~> 2.8.2'
gem 'puma', '~> 2.9.0'
gem 'exceptional', '~> 2.0.33'
gem 'oj', '~> 2.5.5'
@ -37,7 +37,7 @@ gem 'sass-rails', '~> 3.2.6'
gem 'font-awesome-sass', '~> 4.1.0.0'
gem 'bourbon', '~> 3.1.8'
gem 'neat', '~> 1.6.0'
gem 'haml'
gem 'haml', '~> 4.0.5'
gem 'rails_autolink', '~> 1.1.5'
group :assets do

66
Gemfile.lock
View file

@ -1,12 +1,12 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.18)
actionpack (= 3.2.18)
actionmailer (3.2.19)
actionpack (= 3.2.19)
mail (~> 2.5.4)
actionpack (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
actionpack (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -16,18 +16,18 @@ GEM
sprockets (~> 2.2.1)
active_link_to (1.0.2)
actionpack
activemodel (3.2.18)
activesupport (= 3.2.18)
activemodel (3.2.19)
activesupport (= 3.2.19)
builder (~> 3.0.0)
activerecord (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
activerecord (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
activesupport (3.2.18)
activeresource (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
activesupport (3.2.19)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
annotate (2.6.3)
@ -115,7 +115,7 @@ GEM
haml (4.0.5)
tilt
hike (1.2.3)
i18n (0.6.9)
i18n (0.6.11)
journey (1.0.4)
jquery-rails (2.0.3)
railties (>= 3.1.0, < 5.0)
@ -127,7 +127,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.3)
multi_json (1.10.0)
multi_json (1.10.1)
multipart-post (2.0.0)
mysql2 (0.3.15)
neat (1.6.0)
@ -145,7 +145,7 @@ GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.4)
polyglot (0.3.5)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
@ -153,7 +153,7 @@ GEM
pry-byebug (1.3.2)
byebug (~> 2.7)
pry (~> 0.9.12)
puma (2.8.2)
puma (2.9.0)
rack (>= 1.1, < 2.0)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
@ -164,24 +164,24 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.18)
actionmailer (= 3.2.18)
actionpack (= 3.2.18)
activerecord (= 3.2.18)
activeresource (= 3.2.18)
activesupport (= 3.2.18)
rails (3.2.19)
actionmailer (= 3.2.19)
actionpack (= 3.2.19)
activerecord (= 3.2.19)
activeresource (= 3.2.19)
activesupport (= 3.2.19)
bundler (~> 1.0)
railties (= 3.2.18)
railties (= 3.2.19)
rails_autolink (1.1.5)
rails (> 3.1)
railties (3.2.18)
actionpack (= 3.2.18)
activesupport (= 3.2.18)
railties (3.2.19)
actionpack (= 3.2.19)
activesupport (= 3.2.19)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.3.1)
rake (10.3.2)
rdoc (3.12.2)
json (~> 1.4)
rmagick (2.13.2)
@ -235,7 +235,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
tzinfo (0.3.41)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
@ -274,7 +274,7 @@ DEPENDENCIES
faraday (~> 0.9.0)
font-awesome-sass (~> 4.1.0.0)
gruff (~> 0.3.6)
haml
haml (~> 4.0.5)
jquery-rails (~> 2.0.2)
mysql2 (~> 0.3.15)
neat (~> 1.6.0)
@ -283,9 +283,9 @@ DEPENDENCIES
oj (~> 2.5.5)
poltergeist (~> 1.5.0)
pry-byebug (~> 1.3.2)
puma (~> 2.8.2)
puma (~> 2.9.0)
quiet_assets (~> 1.0.2)
rails (~> 3.2.18)
rails (~> 3.2.19)
rails_autolink (~> 1.1.5)
rmagick (~> 2.13.2)
rspec-rails (~> 2.14.1)