Skip to content

Commit

Permalink
Merge pull request #416 from Codeminer42/dependabot/bundler/rails-4.2.11
Browse files Browse the repository at this point in the history
[Security] Bump rails from 4.2.7.1 to 4.2.11
  • Loading branch information
andrerpbts authored Nov 30, 2018
2 parents 3cd6b74 + e4fff87 commit 732005d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 36 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11'

gem 'activeadmin', '~> 1.0.0.pre4'
gem 'api-pagination'
Expand Down
69 changes: 34 additions & 35 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ GEM
specs:
acme-client (0.4.1)
faraday (~> 0.9, >= 0.9.1)
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
actionmailer (4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
actionpack (4.2.11)
actionview (= 4.2.11)
activesupport (= 4.2.11)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
actionview (4.2.11)
activesupport (= 4.2.11)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activeadmin (1.0.0.pre4)
arbre (~> 1.0, >= 1.0.2)
bourbon
Expand All @@ -47,19 +47,18 @@ GEM
ransack (~> 1.3)
sass-rails
sprockets (< 4)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
activejob (4.2.11)
activesupport (= 4.2.11)
globalid (>= 0.3.0)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
activemodel (4.2.11)
activesupport (= 4.2.11)
builder (~> 3.1)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
activerecord (4.2.11)
activemodel (= 4.2.11)
activesupport (= 4.2.11)
arel (~> 6.0)
activesupport (4.2.7.1)
activesupport (4.2.11)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
Expand Down Expand Up @@ -143,7 +142,7 @@ GEM
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 4.0)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.3)
configuration (1.3.4)
connection_pool (2.2.0)
cookiejar (0.3.3)
Expand Down Expand Up @@ -258,7 +257,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.6)
json (2.1.0)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -277,7 +276,7 @@ GEM
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
material_icons (2.2.0)
railties (>= 3.2)
Expand Down Expand Up @@ -353,16 +352,16 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.4.2)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
rails (4.2.11)
actionmailer (= 4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
activemodel (= 4.2.11)
activerecord (= 4.2.11)
activesupport (= 4.2.11)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7.1)
railties (= 4.2.11)
sprockets-rails
rails-assets-jquery (3.1.1)
rails-assets-jquery.gritter (1.7.4)
Expand All @@ -383,9 +382,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
Expand Down Expand Up @@ -586,7 +585,7 @@ DEPENDENCIES
rack-cache
rack-cors
rack-timeout
rails (= 4.2.7.1)
rails (= 4.2.11)
rails-assets-jquery.gritter!
rails-i18n
rails_12factor
Expand Down

0 comments on commit 732005d

Please sign in to comment.