Skip to content

Commit

Permalink
update rails to 4.2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
John Tuttle committed Jan 25, 2019
1 parent a3c7041 commit 54ad1f7
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -14,7 +14,7 @@ gem 'iso8601'
gem 'nokogiri', '>= 1.8.2'
gem 'puma', ' ~> 3.10'
gem 'rack', '~> 1.6.11'
gem 'rails', '~> 4.2'
gem 'rails', '= 4.2.11'
gem 'rails-api'
gem 'rake'
gem 'sprockets', '~> 3.7.0', '>= 3.7.2'
Expand Down
89 changes: 45 additions & 44 deletions Gemfile.lock
Expand Up @@ -19,36 +19,36 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
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.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
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.8)
activesupport (= 4.2.8)
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.3)
activejob (4.2.8)
activesupport (= 4.2.8)
activejob (4.2.11)
activesupport (= 4.2.11)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
activemodel (4.2.11)
activesupport (= 4.2.11)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
activerecord (4.2.11)
activemodel (= 4.2.11)
activesupport (= 4.2.11)
arel (~> 6.0)
activesupport (4.2.8)
activesupport (4.2.11)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand Down Expand Up @@ -104,7 +104,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
command_class (0.0.1)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.4)
conjur-cli (6.1.0)
activesupport (>= 4.2, < 6)
conjur-api (~> 5.1)
Expand Down Expand Up @@ -184,7 +184,7 @@ GEM
sass (>= 3.2)
gherkin (4.1.1)
gli (2.17.1)
globalid (0.4.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
haikunator (1.1.0)
highline (1.7.10)
Expand Down Expand Up @@ -226,20 +226,21 @@ GEM
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.5)
mime-types (>= 1.16, < 4)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.8.2)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.3.0)
mime-types-data (3.2018.0812)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.12.1)
multi_test (0.1.2)
net-ldap (0.16.1)
netrc (0.11.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
openid_connect (1.1.6)
activemodel
attr_required (>= 1.0.0)
Expand Down Expand Up @@ -276,24 +277,24 @@ GEM
rack-rewrite (1.5.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
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.8)
railties (= 4.2.11)
sprockets-rails
rails-api (0.4.1)
actionpack (>= 3.2.11)
railties (>= 3.2.11)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
Expand All @@ -304,13 +305,13 @@ GEM
rails_layout (1.0.41)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.0.0)
rake (12.3.2)
rake_shared_context (0.3.0)
random_password_generator (1.0.0)
rb-fsevent (0.9.8)
Expand Down Expand Up @@ -392,7 +393,7 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand All @@ -404,7 +405,7 @@ GEM
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
tzinfo (1.2.5)
Expand Down Expand Up @@ -479,7 +480,7 @@ DEPENDENCIES
puma (~> 3.10)
rack (~> 1.6.11)
rack-rewrite
rails (~> 4.2)
rails (= 4.2.11)
rails-api
rails_12factor
rails_layout
Expand Down

0 comments on commit 54ad1f7

Please sign in to comment.