Skip to content

Commit

Permalink
Merge pull request #345 from DefactoSoftware/maarten/update-rails
Browse files Browse the repository at this point in the history
[READY] update rails to 4.2.3
  • Loading branch information
fatboypunk committed Aug 18, 2015
2 parents 189505c + ac4a79e commit 802a513
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem "neat"
gem "bitters"
gem "pg"
gem "rack-timeout"
gem "rails", "~> 4.2.2"
gem "rails", "~> 4.2.3"
gem "recipient_interceptor"
gem "sass-rails", "~> 5.0.1"
gem "simple_form", "~> 3.1.0"
Expand Down
80 changes: 40 additions & 40 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actionmailer (4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
actionmailer (4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.2)
actionview (= 4.2.2)
activesupport (= 4.2.2)
actionpack (4.2.3)
actionview (= 4.2.3)
activesupport (= 4.2.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.2)
activesupport (= 4.2.2)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.2)
activesupport (= 4.2.2)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.3)
activesupport (= 4.2.3)
globalid (>= 0.3.0)
activemodel (4.2.2)
activesupport (= 4.2.2)
activemodel (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
activerecord (4.2.2)
activemodel (= 4.2.2)
activesupport (= 4.2.2)
activerecord (4.2.3)
activemodel (= 4.2.3)
activesupport (= 4.2.3)
arel (~> 6.0)
activesupport (4.2.2)
activesupport (4.2.3)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -47,7 +47,7 @@ GEM
apartment (0.26.0)
activerecord (>= 3.1.2, < 5.0)
rack (>= 1.3.6)
arel (6.0.0)
arel (6.0.3)
audited (4.0.0)
rails-observers (~> 0.1.2)
audited-activerecord (4.0.0)
Expand Down Expand Up @@ -150,7 +150,7 @@ GEM
foreman (0.74.0)
dotenv (~> 0.11.1)
thor (~> 0.19.1)
globalid (0.3.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
gravatar_image_tag (1.2.0)
haml (4.0.5)
Expand Down Expand Up @@ -179,15 +179,15 @@ GEM
addressable (~> 2.3)
letter_opener (1.2.0)
launchy (~> 2.2)
loofah (2.0.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memcachier (0.0.2)
method_source (0.8.2)
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.7.0)
minitest (5.8.0)
momentjs-rails (2.7.0)
railties (>= 3.1)
multi_json (1.11.1)
Expand All @@ -213,25 +213,25 @@ GEM
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
rack (1.6.2)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.0.4)
rails (4.2.2)
actionmailer (= 4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
activemodel (= 4.2.2)
activerecord (= 4.2.2)
activesupport (= 4.2.2)
rails (4.2.3)
actionmailer (= 4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
activemodel (= 4.2.3)
activerecord (= 4.2.3)
activesupport (= 4.2.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.2)
railties (= 4.2.3)
sprockets-rails
rails-assets-chartjs (1.0.1)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
Expand All @@ -244,9 +244,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
Expand Down Expand Up @@ -305,9 +305,9 @@ GEM
spring (1.1.3)
spring-commands-rspec (1.0.2)
spring (>= 0.9.1)
sprockets (3.2.0)
sprockets (3.3.1)
rack (~> 1.0)
sprockets-rails (2.3.1)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand Down Expand Up @@ -393,7 +393,7 @@ DEPENDENCIES
pry
pry-rails
rack-timeout
rails (~> 4.2.2)
rails (~> 4.2.3)
rails-assets-chartjs!
rails_12factor
recipient_interceptor
Expand Down

0 comments on commit 802a513

Please sign in to comment.