From 674ec73fa3f3704aeea58ff6e4aa3d9573e8546c Mon Sep 17 00:00:00 2001 From: Despo Pentara Date: Mon, 4 Dec 2017 00:10:59 +0000 Subject: [PATCH] update rails to 4.2.10 and ruby 2.4.2 --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 4 +- Gemfile.lock | 184 +++++++++++++++++++++--------------------- config/application.rb | 1 + spec/spec_helper.rb | 3 - 6 files changed, 99 insertions(+), 97 deletions(-) diff --git a/.ruby-version b/.ruby-version index 0bee604df..8e8299dcc 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.3 +2.4.2 diff --git a/.travis.yml b/.travis.yml index 9ffe5c032..0dd0182eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ addons: code_climate: repo_token: 9b6a47d42b4a745a38818eac18dba4ca94ea88f8c7751859ec49b8cedbf010fe rvm: - - 2.3.3 + - 2.4.2 notifications: email: - social@codebar.io diff --git a/Gemfile b/Gemfile index ece2d4de9..e8e96c641 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -ruby '2.3.3' +ruby '2.4.2' -gem 'rails', '4.2.5' +gem 'rails', '4.2.10' gem 'acts-as-taggable-on', '~> 3.4' gem 'haml' diff --git a/Gemfile.lock b/Gemfile.lock index 502d7a135..a420036a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,45 +27,44 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + 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.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + 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.5) - activesupport (= 4.2.5) + 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.5) - activesupport (= 4.2.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.5) + 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) acts-as-taggable-on (3.5.0) activerecord (>= 3.2, < 5) addressable (2.4.0) - arel (6.0.3) + arel (6.0.4) awesome_print (1.7.0) better_errors (2.1.1) coderay (>= 1.0.0) @@ -73,7 +72,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - builder (3.2.2) + builder (3.2.3) byebug (2.7.0) columnize (~> 0.3) debugger-linecache (~> 1.2) @@ -99,8 +98,8 @@ GEM sass-rails (>= 3.2) chunky_png (1.3.8) cliver (0.3.2) - codeclimate-test-reporter (0.5.0) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.8) + simplecov (<= 0.13) coderay (1.1.0) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -122,7 +121,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.5) coolline (0.5.0) unicode_utils (~> 1.4) coveralls (0.8.10) @@ -132,7 +131,8 @@ GEM term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (~> 1.6.0) - css_parser (1.3.7) + crass (1.0.3) + css_parser (1.6.0) addressable database_cleaner (1.5.1) debug_inspector (0.0.2) @@ -142,7 +142,7 @@ GEM delayed_job_active_record (4.1.0) activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) - diff-lcs (1.2.5) + diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) domain_name (0.5.25) @@ -175,8 +175,8 @@ GEM httparty multi_json (>= 1.9.0) github-markdown (0.6.9) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) grit (2.5.0) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -191,28 +191,31 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) icalendar (2.3.0) jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) jwt (1.5.2) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.7.0) + mini_mime (>= 0.1.1) method_source (0.8.2) mime-types (1.25.1) mini_magick (4.3.6) - mini_portile2 (2.0.0) - minitest (5.8.4) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.10.3) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -221,8 +224,8 @@ GEM net-ssh (3.0.2) netrc (0.11.0) newrelic_rpm (3.15.0.314) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -247,11 +250,12 @@ GEM multi_json (~> 1.0) websocket-driver (>= 0.2.0) posix-spawn (0.3.12) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.11.1) + addressable + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) - premailer-rails (1.9.0) - actionmailer (>= 3, < 5) + premailer-rails (1.10.1) + actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.9.12.6) coderay (~> 1.0) @@ -278,27 +282,27 @@ GEM puma (2.15.3) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.4) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + 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.5) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails4-autocomplete (1.1.1) rails (>= 3.0) @@ -307,12 +311,12 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.4) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.5.0) + rake (12.3.0) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -325,48 +329,48 @@ GEM rolify (5.0.0) rspec-collection_matchers (1.1.2) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.4.1) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec-core (3.7.0) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) + rspec-support (~> 3.7.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.1) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.0) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - sass (3.4.21) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.0) + sass (3.4.25) + 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) shoulda-matchers (3.1.0) activesupport (>= 4.0.0) - simple_form (3.2.1) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) - simplecov (0.11.1) + simple_form (3.5.0) + actionpack (> 4, < 5.2) + activemodel (> 4, < 5.2) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slop (3.6.0) - sprockets (3.5.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -374,14 +378,14 @@ GEM faraday (~> 0.9) term-ansicolor (1.3.2) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.2) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.8) timecop (0.8.0) tins (1.6.0) turbolinks (2.5.3) coffee-rails - tzinfo (1.2.2) + tzinfo (1.2.4) thread_safe (~> 0.1) tzinfo-data (1.2015.7) tzinfo (>= 1.0.0) @@ -445,7 +449,7 @@ DEPENDENCIES pry-remote puma pundit - rails (= 4.2.5) + rails (= 4.2.10) rails4-autocomplete rails_12factor redcarpet @@ -463,7 +467,7 @@ DEPENDENCIES uglifier (>= 1.3.0) RUBY VERSION - ruby 2.3.3p222 + ruby 2.4.2p198 BUNDLED WITH - 1.15.1 + 1.16.0 diff --git a/config/application.rb b/config/application.rb index 02f592244..03e901c0a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -21,6 +21,7 @@ class Application < Rails::Application # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. config.time_zone = 'London' config.active_record.default_timezone = :local + config.active_record.raise_in_transactional_callbacks = true # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 14b0980c1..77e01a669 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,9 +1,6 @@ require 'simplecov' require 'coveralls' -require "codeclimate-test-reporter" require 'shoulda/matchers' -CodeClimate::TestReporter.start - SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter