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.2.5

This commit is contained in:
Erik Michaels-Ober 2015-11-12 18:28:04 +01:00
parent 2efe87f2fe
commit 62ad31c044
2 changed files with 31 additions and 31 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.2.3' ruby '2.2.3'
gem 'rails', '~> 4.2.4' gem 'rails', '~> 4.2.5'
gem 'arel' gem 'arel'
gem 'devise' gem 'devise'

60
Gemfile.lock
View File

@ -1,36 +1,36 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.4) actionmailer (4.2.5)
actionpack (= 4.2.4) actionpack (= 4.2.5)
actionview (= 4.2.4) actionview (= 4.2.5)
activejob (= 4.2.4) activejob (= 4.2.5)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.4) actionpack (4.2.5)
actionview (= 4.2.4) actionview (= 4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
rack (~> 1.6) rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.4) actionview (4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.4) activejob (4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.4) activemodel (4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.4) activerecord (4.2.5)
activemodel (= 4.2.4) activemodel (= 4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
arel (~> 6.0) arel (~> 6.0)
activesupport (4.2.4) activesupport (4.2.5)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -116,16 +116,16 @@ GEM
rack (~> 1.1) rack (~> 1.1)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.4) rails (4.2.5)
actionmailer (= 4.2.4) actionmailer (= 4.2.5)
actionpack (= 4.2.4) actionpack (= 4.2.5)
actionview (= 4.2.4) actionview (= 4.2.5)
activejob (= 4.2.4) activejob (= 4.2.5)
activemodel (= 4.2.4) activemodel (= 4.2.5)
activerecord (= 4.2.4) activerecord (= 4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.4) railties (= 4.2.5)
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
@ -154,9 +154,9 @@ GEM
sass-rails (>= 4.0, < 6) sass-rails (>= 4.0, < 6)
rails_serve_static_assets (0.0.4) rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.4) rails_stdout_logging (0.0.4)
railties (4.2.4) railties (4.2.5)
actionpack (= 4.2.4) actionpack (= 4.2.5)
activesupport (= 4.2.4) activesupport (= 4.2.5)
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)
@ -236,7 +236,7 @@ DEPENDENCIES
nokogiri nokogiri
pg pg
puma puma
rails (~> 4.2.4) rails (~> 4.2.5)
rails_12factor rails_12factor
rails_admin rails_admin
rubocop rubocop