diff --git a/Gemfile b/Gemfile index 43b091ed2..a5a3cc74f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.4.2' -gem 'rails', '~> 4.2', '>= 4.2.7.1' +gem 'rails', '~> 4.2' gem 'pg', '0.20' # locked to 0.20 due to https://github.com/rails/rails/issues/29521 gem 'devise', '~> 3.5', '>= 3.5.10' gem 'devise_invitable', '~> 1.6', '>= 1.6.1' diff --git a/Gemfile.lock b/Gemfile.lock index ec3f708d6..176fb8e2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,36 +9,36 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actionmailer (4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) 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.10) - activesupport (= 4.2.10) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) 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.10) - activesupport (= 4.2.10) + activejob (4.2.11.3) + activesupport (= 4.2.11.3) globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.10) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -65,7 +65,7 @@ GEM railties (>= 3.0) bootstrap_sortable_rails (0.1.3) breadcrumbs_on_rails (3.0.1) - builder (3.2.3) + builder (3.2.4) byebug (9.1.0) capybara (2.4.1) mime-types (>= 1.16) @@ -99,7 +99,7 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) + crass (1.0.6) cucumber (3.1.0) builder (>= 2.1.2) cucumber-core (~> 3.1.0) @@ -175,7 +175,7 @@ GEM momentjs-rails (>= 2.9.0) geocoder (1.4.5) gherkin (5.0.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) hashdiff (0.3.7) heroku-api (0.4.3) @@ -185,7 +185,7 @@ GEM http_parser.rb (0.6.0) httparty (0.15.6) multi_xml (>= 0.5.2) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) jar_wrapper (0.1.8) zip @@ -217,22 +217,22 @@ GEM letter_opener (1.4.1) launchy (~> 2.2) libv8 (3.16.14.19) - loofah (2.1.1) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) meta-tags (2.7.0) actionpack (>= 3.2.0, < 5.3) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_mime (1.0.0) + mini_mime (1.0.2) mini_portile2 (2.1.0) - minitest (5.10.3) + minitest (5.14.2) momentjs-rails (2.17.1) railties (>= 3.1) - multi_json (1.12.2) + multi_json (1.15.0) multi_test (0.1.2) multi_xml (0.6.0) newrelic_rpm (4.6.0.338) @@ -262,7 +262,7 @@ GEM multi_json quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.8) + rack (1.6.13) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -271,25 +271,25 @@ GEM builder (>= 2.0.0) rack (>= 1.0.0) railroady (1.5.3) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rails (4.2.11.3) + actionmailer (= 4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) + activemodel (= 4.2.11.3) + activerecord (= 4.2.11.3) + activesupport (= 4.2.11.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) + railties (= 4.2.11.3) sprockets-rails 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.3) - loofah (~> 2.0) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -297,15 +297,15 @@ GEM rails (> 3.1) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.19.0) - rake (12.3.0) + rake (13.0.3) redcarpet (3.4.0) ref (2.0.0) responders (2.4.0) @@ -395,7 +395,7 @@ GEM execjs (~> 2.2) rails (~> 4.1) railties (~> 4.1) - tzinfo (1.2.4) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -469,7 +469,7 @@ DEPENDENCIES quiet_assets rack_session_access railroady - rails (~> 4.2, >= 4.2.7.1) + rails (~> 4.2) rails_12factor rails_autolink redcarpet