From 7468880001e98d60e65fef341142bdc6926811f9 Mon Sep 17 00:00:00 2001 From: Josh Kalov Date: Wed, 21 Mar 2018 18:40:19 -0500 Subject: [PATCH] update ruby and rails --- .ruby-version | 2 +- Gemfile | 4 +- Gemfile.lock | 465 ++++++++++++++++++------------------ config/deploy/production.rb | 2 +- config/deploy/staging.rb | 2 +- 5 files changed, 239 insertions(+), 236 deletions(-) diff --git a/.ruby-version b/.ruby-version index 21bb5e156..a6333e400 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.5 +2.2.9 diff --git a/Gemfile b/Gemfile index b008191b5..ab08e68ee 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -ruby '2.2.5' +ruby '2.2.9' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.0' +gem 'rails', '~> 4.2.10' # gem 'pg' # soooooon! # must use this version of mysql2 for rails 4.0.0 diff --git a/Gemfile.lock b/Gemfile.lock index 92f7e4605..e212b4892 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GIT remote: git://github.com/activerecord-hackery/ransack.git - revision: 2ec5e8658fb7961b159740aeccf9262c00d6e09c + revision: 49d3b70a59193203a6f5c8565ed4c571443b8bc7 specs: - ransack (1.8.2) + ransack (1.8.8) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.3) + polyamorous (~> 1.3.2) GIT remote: git://github.com/capistrano/capistrano.git @@ -32,97 +32,98 @@ GIT GEM remote: https://rubygems.org/ specs: - aasm (4.11.0) - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + aasm (4.12.3) + concurrent-ruby (~> 1.0) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) 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.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) 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.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.7.1) - activesupport (= 4.2.7.1) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.7.1) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - annotate (2.7.1) + annotate (2.7.2) activerecord (>= 3.2, < 6.0) - rake (>= 10.4, < 12.0) + rake (>= 10.4, < 13.0) ansi (1.5.0) - arel (6.0.3) - ast (2.3.0) - backports (3.6.8) + arel (6.0.4) + ast (2.4.0) + backports (3.11.1) bcrypt (3.1.11) best_in_place (3.0.3) actionpack (>= 3.2) railties (>= 3.2) - builder (3.2.2) - bullet (5.3.0) + builder (3.2.3) + bullet (5.7.5) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - capybara (2.8.0) + uniform_notifier (~> 1.11.0) + capybara (2.18.0) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-email (2.5.0) capybara (~> 2.4) mail - capybara-screenshot (1.0.13) + capybara-screenshot (1.0.18) capybara (>= 1.0, < 3) launchy chronic (0.10.2) cliver (0.3.2) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) - coderay (1.1.1) - coffee-rails (4.2.1) + codeclimate-test-reporter (1.0.8) + simplecov (<= 0.13) + coderay (1.1.2) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) - coveralls (0.8.15) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + coveralls (0.8.19) json (>= 1.8, < 3) simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (>= 1.6.0, < 2) - daemons (1.2.4) - database_cleaner (1.5.3) - debug_inspector (0.0.2) - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.1) - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.1) + tins (~> 1.6) + crass (1.0.3) + daemons (1.2.6) + database_cleaner (1.6.2) + debug_inspector (0.0.3) + delayed_job (4.1.4) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) devise (4.1.1) bcrypt (~> 3.0) @@ -130,46 +131,46 @@ GEM railties (>= 4.1.0, < 5.1) responders warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20160615) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - ethon (0.9.0) + ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) - factory_girl (4.7.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) - faker (1.6.6) - i18n (~> 0.5) - faraday (0.9.2) + faker (1.8.7) + i18n (>= 0.7) + faraday (0.14.0) multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) fast_blank (1.0.0) - ffi (1.9.14) + ffi (1.9.23) flamegraph (0.9.5) formatador (0.2.5) - gh (0.14.0) - addressable + gh (0.15.1) + addressable (~> 2.4.0) backports faraday (~> 0.8) multi_json (~> 1.0) - net-http-persistent (>= 2.7) + net-http-persistent (~> 2.9) net-http-pipeline - gibbon (2.2.4) + gibbon (2.2.5) faraday (>= 0.9.1) multi_json (>= 1.11.0) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) gsm_encoder (0.1.6) - guard (2.14.0) + guard (2.14.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) - lumberjack (~> 1.0) + lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) pry (>= 0.9.12) @@ -187,74 +188,74 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - guard-rubocop (1.2.0) + guard-rubocop (1.3.0) guard (~> 2.0) rubocop (~> 0.20) has_secure_token (1.0.0) activerecord (>= 3.0) hashr (0.0.22) - health_check (2.2.1) - rails (>= 4.0) - highline (1.7.8) + health_check (2.8.0) + railties (~> 4.0) + highline (1.7.10) holder_rails (2.9.3) railties (>= 3.1.0) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.14.0) + httparty (0.16.1) multi_xml (>= 0.5.2) - i18n (0.7.0) - icalendar (2.4.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + icalendar (2.4.1) jbuilder (1.0.2) activesupport (>= 3.0.0) - jquery-rails (4.1.1) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-validation-rails (1.13.1) - railties (>= 3.2, < 5.0) - thor (~> 0.14) - json (1.8.3) - jwt (1.5.4) - kgio (2.10.0) + jquery-validation-rails (1.16.0) + json (2.1.0) + jwt (2.1.0) + kgio (2.11.2) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.15) + libv8 (3.16.14.19) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.0.3) + loofah (2.2.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.10) + lumberjack (1.0.12) mail (2.6.3) mime-types (>= 1.16, < 3) - maskedinput-rails (1.4.0.0) - memory_profiler (0.9.6) + maskedinput-rails (1.4.1.0) + memory_profiler (0.9.10) memory_test_fix (1.3.0) activerecord (>= 4.0.0, < 4.99.0) railties (>= 4.0.0, < 4.99.0) metaclass (0.0.4) - method_source (0.8.2) - mime-types (1.25.1) - mini_portile2 (2.1.0) - minitest (5.9.0) - mocha (1.1.0) + method_source (0.9.0) + mime-types (2.99.3) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + mocha (1.4.0) metaclass (~> 0.0.1) - mock_redis (0.17.0) - monetize (1.4.0) - money (~> 6.7) - money (6.7.1) - i18n (>= 0.6.4, <= 0.7.0) - sixarm_ruby_unaccent (>= 1.1.1, < 2) - money-rails (1.6.2) + mock_redis (0.17.3) + monetize (1.7.0) + money (~> 6.9) + money (6.10.1) + i18n (>= 0.6.4, < 1.0) + money-rails (1.10.0) activesupport (>= 3.0) - monetize (~> 1.4.0) - money (~> 6.7) + monetize (~> 1.7.0) + money (~> 6.10.0) railties (>= 3.0) - multi_json (1.12.1) - multi_xml (0.5.5) + multi_json (1.13.1) + multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.4.4) + mysql2 (0.5.0) nenv (0.3.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) @@ -262,72 +263,69 @@ GEM net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (3.2.0) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) + net-ssh (4.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) netrc (0.11.0) - newrelic_rpm (3.16.1.320) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) + newrelic_rpm (4.8.0.341) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - paper_trail (5.2.0) - activerecord (>= 3.0, < 6.0) - activesupport (>= 3.0, < 6.0) + paper_trail (8.1.2) + activerecord (>= 4.2, < 5.2) request_store (~> 1.1) paper_trail-globalid (0.2.0) globalid paper_trail (>= 3.0.0) - parser (2.3.1.2) - ast (~> 2.2) - phony (2.15.28) - phony_rails (0.14.2) + parallel (1.12.1) + parser (2.5.0.4) + ast (~> 2.4.0) + phony (2.16.3) + phony_rails (0.14.6) activesupport (>= 3.0) - phony (~> 2.12) - pkg-config (1.1.7) - poltergeist (1.10.0) + phony (> 2.15) + poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - polyamorous (1.3.1) + polyamorous (1.3.3) activerecord (>= 3.0) powerpack (0.1.1) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - puma (3.6.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.3) pusher-client (0.6.2) json websocket (~> 1.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) - rack-mini-profiler (0.10.1) + rack (1.6.9) + rack-mini-profiler (0.10.7) rack (>= 1.2.0) rack-test (0.6.3) rack (>= 1.0) - 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.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) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7.1) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.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) @@ -336,98 +334,103 @@ 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.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.17.0) - rake (11.2.2) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - redis (3.3.1) + rainbow (3.0.0) + raindrops (0.19.0) + rake (12.3.0) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redis (4.0.1) ref (2.0.0) - request_store (1.3.1) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + request_store (1.4.1) + rack (>= 1.4) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.2) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.5.0) - rspec-core (~> 3.3) - rspec-support (3.5.0) - rubocop (0.42.0) - parser (>= 2.3.1.1, < 3.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-retry (0.5.7) + rspec-core (> 3.3) + rspec-support (3.7.1) + rubocop (0.54.0) + parallel (~> 1.10) + parser (>= 2.5) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-prof (0.15.9) - ruby-progressbar (1.8.1) - ruby_dep (1.4.0) + ruby-prof (0.17.0) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) rvm-capistrano (1.5.6) capistrano (~> 2.15.4) - sass (3.4.22) - sass-rails (5.0.6) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) shellany (0.0.1) - shoulda-matchers (3.1.1) + shoulda-matchers (3.1.2) activesupport (>= 4.0.0) simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sixarm_ruby_unaccent (1.1.1) - slop (3.6.0) + simplecov-html (0.10.2) sms-spec (0.2.0) rspec (~> 3.1) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.11) - stackprof (0.2.9) - term-ansicolor (1.3.2) + sqlite3 (1.3.13) + stackprof (0.2.11) + term-ansicolor (1.6.0) tins (~> 1.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - tins (1.12.0) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.8) + timecop (0.9.1) + tins (1.16.3) tire (0.6.2) activemodel (>= 3.0) activesupport @@ -436,7 +439,7 @@ GEM multi_json (~> 1.3) rake rest-client (~> 1.6) - travis (1.8.2) + travis (1.8.8) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -445,13 +448,13 @@ GEM launchy (~> 2.1) pusher-client (~> 0.4) typhoeus (~> 0.6, >= 0.6.8) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.0) - twilio-ruby (4.11.1) - builder (>= 2.1.2) - jwt (~> 1.0) - multi_json (>= 1.3.0) + turbolinks (5.1.0) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + twilio-ruby (5.7.1) + faraday (~> 0.9) + jwt (>= 1.5, <= 2.5) + nokogiri (>= 1.6, < 2.0) twitter-bootstrap-rails (2.2.8) actionpack (>= 3.1) execjs @@ -463,44 +466,44 @@ GEM railties (>= 3.1) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.0.1) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (5.1.0) + unf_ext (0.0.7.5) + unicode-display_width (1.3.0) + unicorn (5.4.0) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.10.0) - validates_overlap (0.6.0) + uniform_notifier (1.11.0) + validates_overlap (0.8.6) rails (>= 3.0.0) - validates_zipcode (0.0.12) + validates_zipcode (0.0.19) activemodel (>= 3.2.0) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) web-console (3.3.0) activemodel (>= 4.2) debug_inspector railties (>= 4.2) - websocket (1.2.3) - websocket-driver (0.6.4) + websocket (1.2.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - whenever (0.9.7) + websocket-extensions (0.1.3) + whenever (0.10.0) chronic (>= 0.6.3) - will_paginate (3.1.0) + will_paginate (3.1.6) will_paginate-bootstrap (0.2.5) will_paginate (>= 3.0.3) - wit (3.4.0) - wuparty (1.2.6) + wit (6.0.0) + wuparty (1.2.7) httparty (>= 0.6.1) - mime-types (~> 1.16) + mime-types (>= 1.16) multipart-post (>= 1.0.1) - xpath (2.0.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -559,7 +562,7 @@ DEPENDENCIES puma quiet_assets rack-mini-profiler - rails (~> 4.2.0) + rails (~> 4.2.10) rails_12factor ransack! redis @@ -593,7 +596,7 @@ DEPENDENCIES wuparty RUBY VERSION - ruby 2.2.5p319 + ruby 2.2.9p480 BUNDLED WITH - 1.12.5 + 1.16.1 diff --git a/config/deploy/production.rb b/config/deploy/production.rb index bf168bfc5..da2dd15c2 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,5 +1,5 @@ set :application, 'logan-production' set :branch, fetch(:branch, ENV['PRODUCTION_BRANCH']) -set :rvm_ruby_string, '2.2.5@production' # use the same ruby as used locally for deployment +set :rvm_ruby_string, '2.2.9@production' # use the same ruby as used locally for deployment server ENV['PRODUCTION_SERVER'], :app, :web, :db, primary: true diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index aafac416a..83f9c566b 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,7 +1,7 @@ set :application, 'logan-staging' set :branch, fetch(:branch, ENV['STAGING_BRANCH']) set :rails_env, :staging -set :rvm_ruby_string, '2.2.5@staging' # use the same ruby as used locally for deployment +set :rvm_ruby_string, '2.2.9@staging' # use the same ruby as used locally for deployment server ENV['STAGING_SERVER'], :app, :web, :db, primary: true