choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update rails to version 4.1.6

This commit is contained in:
Erik Michaels-Ober 2014-09-12 03:06:45 +02:00
parent 2173b345b5
commit b75dc83389
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.1.2' ruby '2.1.2'
gem 'rails', '~> 4.1.5' gem 'rails', '~> 4.1.6'
gem 'arel' gem 'arel'
gem 'devise' gem 'devise'

65
Gemfile.lock
View File

@ -1,27 +1,27 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.5) actionmailer (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
mail (~> 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.5) actionpack (4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.5) actionview (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.5) activemodel (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.5) activerecord (4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.5) activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -78,11 +78,10 @@ GEM
kaminari (0.16.1) kaminari (0.16.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
mail (2.5.4) mail (2.6.1)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (2.3)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.1) minitest (5.4.1)
multi_json (1.10.1) multi_json (1.10.1)
@ -95,7 +94,6 @@ GEM
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5) slop (~> 3.4, >= 3.4.5)
pg (0.17.1) pg (0.17.1)
polyglot (0.3.5)
powerpack (0.0.9) powerpack (0.0.9)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
@ -109,15 +107,15 @@ GEM
rack (~> 1.1) rack (~> 1.1)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.5) rails (4.1.6)
actionmailer (= 4.1.5) actionmailer (= 4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activerecord (= 4.1.5) activerecord (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5) railties (= 4.1.6)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails_12factor (0.0.2) rails_12factor (0.0.2)
rails_serve_static_assets rails_serve_static_assets
@ -138,9 +136,9 @@ GEM
sass-rails (~> 4.0) sass-rails (~> 4.0)
rails_serve_static_assets (0.0.2) rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3) rails_stdout_logging (0.0.3)
railties (4.1.5) railties (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
@ -186,9 +184,6 @@ GEM
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
tins (1.3.2) tins (1.3.2)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.5.3)
@ -217,7 +212,7 @@ DEPENDENCIES
pg pg
pry pry
puma puma
rails (~> 4.1.5) rails (~> 4.1.6)
rails_12factor rails_12factor
rails_admin rails_admin
rubocop rubocop