diff --git a/Gemfile b/Gemfile index cb9522d..2457e8d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -ruby '2.4.0' +ruby '2.4.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.1.1' +gem 'rails', '5.1.4' # Use sqlite3 as the database for Active Record gem 'sqlite3', :group => :development @@ -55,8 +55,8 @@ gem 'delayed_job_active_record' gem 'puma' group :development do - gem 'rubocop' + gem 'rubocop' gem 'bullet' gem 'brakeman' end - + diff --git a/Gemfile.lock b/Gemfile.lock index e78c9a0..ee86618 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,39 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.1) - actionpack (= 5.1.1) + actioncable (5.1.4) + actionpack (= 5.1.4) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.1) - actionview (= 5.1.1) - activesupport (= 5.1.1) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.1) - activesupport (= 5.1.1) + actionview (5.1.4) + activesupport (= 5.1.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.1) - activesupport (= 5.1.1) + activejob (5.1.4) + activesupport (= 5.1.4) globalid (>= 0.3.6) - activemodel (5.1.1) - activesupport (= 5.1.1) - activerecord (5.1.1) - activemodel (= 5.1.1) - activesupport (= 5.1.1) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) arel (~> 8.0) - activesupport (5.1.1) + activesupport (5.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -41,12 +41,12 @@ GEM arel (8.0.0) ast (2.3.0) bcrypt (3.1.11) - brakeman (3.7.2) + brakeman (4.0.1) builder (3.2.3) - bullet (5.6.1) + bullet (5.7.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) - cancancan (2.0.0) + cancancan (2.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -55,6 +55,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) + crass (1.0.3) dalli (2.7.6) delayed_job (4.1.3) activesupport (>= 3.0, < 5.2) @@ -67,11 +68,12 @@ GEM railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) - erubi (1.6.1) + erubi (1.7.0) execjs (2.7.0) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -81,42 +83,41 @@ GEM thor (>= 0.14, < 2.0) json (1.8.6) libv8 (3.16.14.19) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.2.0) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) minitest (5.10.3) multi_json (1.12.2) - mysql2 (0.4.9) - newrelic_rpm (4.4.0.336) + mysql2 (0.4.10) + newrelic_rpm (4.6.0.338) nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) powerpack (0.1.1) - puma (3.10.0) + puma (3.11.0) rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.1) - actioncable (= 5.1.1) - actionmailer (= 5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) - activemodel (= 5.1.1) - activerecord (= 5.1.1) - activesupport (= 5.1.1) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.1) + rack-test (0.8.2) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -128,15 +129,15 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.1.1) - actionpack (= 5.1.1) - activesupport (= 5.1.1) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.1.0) + rake (12.3.0) rb-readline (0.5.5) rdoc (4.3.0) ref (2.0.0) @@ -144,14 +145,14 @@ GEM actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) round_robin_tournament (0.0.1) - rubocop (0.49.1) + rubocop (0.51.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -173,9 +174,9 @@ GEM turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.3) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.0.2) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) uniform_notifier (1.10.0) @@ -183,7 +184,7 @@ GEM rack (>= 1.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) PLATFORMS ruby @@ -201,7 +202,7 @@ DEPENDENCIES mysql2 newrelic_rpm puma - rails (= 5.1.1) + rails (= 5.1.4) rails_12factor rb-readline round_robin_tournament @@ -214,7 +215,7 @@ DEPENDENCIES uglifier RUBY VERSION - ruby 2.4.0p0 + ruby 2.4.2p198 BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/rails-dev-Dockerfile b/rails-dev-Dockerfile index dea3cd8..8aa6a7e 100644 --- a/rails-dev-Dockerfile +++ b/rails-dev-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.0 +FROM ruby:2.4.2 RUN apt-get -qq update \ && apt-get -qq install -y \ diff --git a/rails-prod-Dockerfile b/rails-prod-Dockerfile index be0ba22..5937155 100644 --- a/rails-prod-Dockerfile +++ b/rails-prod-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.0 +FROM ruby:2.4.2 RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \