From 17abdaeac5d632f53385ff139c0cd262a88be1a2 Mon Sep 17 00:00:00 2001 From: DgDevill Date: Thu, 7 Sep 2017 11:24:40 +0200 Subject: [PATCH 1/7] ruby 2.4.1; rails < 5.0 --- .ruby-version | 2 +- Gemfile | 4 +- Gemfile.lock | 116 ++++++++++++++++++++++++++------------------------ 3 files changed, 63 insertions(+), 59 deletions(-) diff --git a/.ruby-version b/.ruby-version index 276cbf9e2..005119baa 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.4.1 diff --git a/Gemfile b/Gemfile index 0798d9109..1a5b3781f 100755 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,12 @@ source 'https://rubygems.org' -ruby '2.3.0' +ruby '2.4.1' gem 'activeadmin', '1.0.0.pre2' gem 'delayed_job_active_record', '~> 4.0.3' gem 'devise' gem 'pg' -gem 'rails', '4.2.5.2' +gem 'rails', '< 5.0' gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index 24fd9f7e1..44c715966 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) + actionmailer (4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.2) - actionview (= 4.2.5.2) - activesupport (= 4.2.5.2) + actionpack (4.2.9) + actionview (= 4.2.9) + activesupport (= 4.2.9) 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.2) - activesupport (= 4.2.5.2) + actionview (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.0.3) activeadmin (1.0.0.pre2) arbre (~> 1.0, >= 1.0.2) bourbon @@ -33,30 +33,29 @@ GEM rails (>= 3.2, < 5.0) ransack (~> 1.3) sass-rails - activejob (4.2.5.2) - activesupport (= 4.2.5.2) + activejob (4.2.9) + activesupport (= 4.2.9) globalid (>= 0.3.0) - activemodel (4.2.5.2) - activesupport (= 4.2.5.2) + activemodel (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) - activerecord (4.2.5.2) - activemodel (= 4.2.5.2) - activesupport (= 4.2.5.2) + activerecord (4.2.9) + activemodel (= 4.2.9) + activesupport (= 4.2.9) arel (~> 6.0) - activesupport (4.2.5.2) + activesupport (4.2.9) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arbre (1.0.3) activesupport (>= 3.0.0) - arel (6.0.3) + arel (6.0.4) bcrypt (3.1.11) bourbon (4.2.6) sass (~> 3.4) thor (~> 0.19) - builder (3.2.2) + builder (3.2.3) coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -65,7 +64,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.5) delayed_job (4.0.6) activesupport (>= 3.0, < 5.0) delayed_job_active_record (4.0.3) @@ -88,12 +87,12 @@ GEM formtastic (3.1.3) actionpack (>= 3.2.13) formtastic_i18n (0.5.0) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.0) + activesupport (>= 4.2.0) has_scope (0.6.0) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) - i18n (0.7.0) + i18n (0.8.6) inherited_resources (1.6.0) actionpack (>= 3.2, < 5) has_scope (~> 0.6.0.rc) @@ -105,21 +104,23 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (2.1.0) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.6) + mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.99.1) - mini_portile2 (2.0.0) - minitest (5.8.4) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.2.0) + minitest (5.10.3) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) orm_adapter (0.5.0) pg (0.18.4) polyamorous (1.3.0) @@ -129,25 +130,25 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.4) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.2) - actionmailer (= 4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) - activemodel (= 4.2.5.2) - activerecord (= 4.2.5.2) - activesupport (= 4.2.5.2) + rails (4.2.9) + actionmailer (= 4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) + activemodel (= 4.2.9) + activerecord (= 4.2.9) + activesupport (= 4.2.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.2) + railties (= 4.2.9) 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.3) loofah (~> 2.0) @@ -156,13 +157,13 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.4) - railties (4.2.5.2) - actionpack (= 4.2.5.2) - activesupport (= 4.2.5.2) + railties (4.2.9) + actionpack (= 4.2.9) + activesupport (= 4.2.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (10.5.0) + rake (12.0.0) ransack (1.7.0) actionpack (>= 3.0) activerecord (>= 3.0) @@ -196,19 +197,19 @@ GEM sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) slop (3.6.0) - sprockets (3.5.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) test-unit (3.1.7) power_assert - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.0) + thread_safe (0.3.6) tilt (2.0.2) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -231,7 +232,7 @@ DEPENDENCIES dotenv-rails pg pry - rails (= 4.2.5.2) + rails (< 5.0) rails_12factor rails_serve_static_assets rspec-mocks (= 3.4.1) @@ -241,5 +242,8 @@ DEPENDENCIES uglifier unicorn +RUBY VERSION + ruby 2.4.1p111 + BUNDLED WITH - 1.11.2 + 1.16.0.pre.2 From 1c9946f3f3b740642d4eaef85493fd87a561e2ac Mon Sep 17 00:00:00 2001 From: DgDevill Date: Thu, 7 Sep 2017 12:17:23 +0200 Subject: [PATCH 2/7] rspec-rails upgraded --- Gemfile | 3 +-- Gemfile.lock | 35 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 1a5b3781f..14cf83610 100755 --- a/Gemfile +++ b/Gemfile @@ -20,8 +20,7 @@ end group :development, :test do gem 'pry' - gem 'rspec-rails', '3.4.2' - gem 'rspec-mocks', '3.4.1' + gem 'rspec-rails', '3.6.1' gem 'test-unit', '~> 3.0' gem "dotenv-rails" end diff --git a/Gemfile.lock b/Gemfile.lock index 44c715966..5200ccdbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,7 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.3) dotenv (2.1.0) dotenv-rails (2.1.0) dotenv (= 2.1.0) @@ -172,23 +172,23 @@ GEM polyamorous (~> 1.2) responders (2.1.1) railties (>= 4.2.0, < 5.1) - rspec-core (3.4.3) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - 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) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) @@ -235,8 +235,7 @@ DEPENDENCIES rails (< 5.0) rails_12factor rails_serve_static_assets - rspec-mocks (= 3.4.1) - rspec-rails (= 3.4.2) + rspec-rails (= 3.6.1) sass-rails (~> 5.0.1) test-unit (~> 3.0) uglifier From 967d530e8ab7cf440ef13fe69ad80a2fc1931854 Mon Sep 17 00:00:00 2001 From: DgDevill Date: Thu, 7 Sep 2017 12:51:09 +0200 Subject: [PATCH 3/7] rails configs updated --- bin/bundle | 3 ++ bin/rails | 4 +++ bin/rake | 4 +++ bin/setup | 29 +++++++++++++++++++ config/application.rb | 6 +++- config/environments/development.rb | 15 ++++++++++ config/environments/production.rb | 17 +++++++++++ config/environments/test.rb | 10 +++++++ config/initializers/cookies_serializer.rb | 3 ++ .../initializers/filter_parameter_logging.rb | 4 +++ config/initializers/inflections.rb | 11 +++---- config/initializers/mime_types.rb | 1 - 12 files changed, 100 insertions(+), 7 deletions(-) create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5191e6927 --- /dev/null +++ b/bin/rails @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..17240489f --- /dev/null +++ b/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..acdb2c138 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file: + + puts "== Installing dependencies ==" + system "gem install bundler --conservative" + system "bundle check || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/config/application.rb b/config/application.rb index 56f5787f3..6485db4b7 100755 --- a/config/application.rb +++ b/config/application.rb @@ -2,7 +2,8 @@ require 'rails/all' - +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) module Prelaunchr @@ -32,6 +33,9 @@ class Application < Rails::Application # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] diff --git a/config/environments/development.rb b/config/environments/development.rb index 22ceb4216..9bdcc3c49 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,14 +34,29 @@ # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + # Do not compress assets config.assets.compress = false # Expands the lines which load the assets config.assets.debug = true + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + # For mailer configs config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true config.action_mailer.default_url_options = { :host => ENV['DEFAULT_MAILER_HOST'] } + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true end diff --git a/config/environments/production.rb b/config/environments/production.rb index ea0be6fda..b4797bdd6 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -10,8 +10,20 @@ config.eager_load = true + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Apache or NGINX already handles this. + config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present? + # Compress JavaScripts and CSS config.assets.compress = true + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + # Don't fallback to assets pipeline if a precompiled asset is missed config.assets.compile = false @@ -19,6 +31,8 @@ # Generate digests for assets URLs config.assets.digest = true + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + # Defaults to nil and saved in location specified by config.assets.prefix # config.assets.manifest = YOUR_PATH @@ -62,6 +76,9 @@ config.action_mailer.default_url_options = { :host => ENV['DEFAULT_MAILER_HOST'] } + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + # Log the query plan for queries taking more than this (works # with SQLite, MySQL, and PostgreSQL) # config.active_record.auto_explain_threshold_in_seconds = 0.5 diff --git a/config/environments/test.rb b/config/environments/test.rb index 4737e9045..963ee1b4a 100755 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -15,6 +15,10 @@ config.eager_load = false + # Configure static file server for tests with Cache-Control for performance. + # config.serve_static_files = true + # config.static_cache_control = 'public, max-age=3600' + # Show full error reports and disable caching config.consider_all_requests_local = true config.action_controller.perform_caching = false @@ -30,6 +34,12 @@ # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test + # Randomize the order test cases are executed. + config.active_support.test_order = :random + # Print deprecation notices to the stderr config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true end diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..ac5f8b663 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.action_dispatch.cookies_serializer = :marshal diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 5d8d9be23..ac033bf9d 100755 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,15 +1,16 @@ # Be sure to restart your server when you modify this file. -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| # inflect.plural /^(ox)$/i, '\1en' # inflect.singular /^(ox)en/i, '\1' # inflect.irregular 'person', 'people' # inflect.uncountable %w( fish sheep ) # end -# + # These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections do |inflect| +# ActiveSupport::Inflector.inflections(:en) do |inflect| # inflect.acronym 'RESTful' # end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 72aca7e44..dc1899682 100755 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -2,4 +2,3 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone From d1a5b6207717fadf32eede20495536af77bc18fe Mon Sep 17 00:00:00 2001 From: DgDevill Date: Thu, 7 Sep 2017 13:22:58 +0200 Subject: [PATCH 4/7] fix: Sprockets deprecation warnings --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 14cf83610..cea35bf66 100755 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'unicorn' # in production environments by default. group :assets do gem 'coffee-rails', '~> 4.1.0' - gem 'sass-rails', '~> 5.0.1' + gem 'sass-rails', '~> 5.0' gem 'uglifier' end diff --git a/Gemfile.lock b/Gemfile.lock index 5200ccdbd..ec310d8ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,6 +84,7 @@ GEM railties (>= 4.0, < 5.1) erubis (2.7.0) execjs (2.6.0) + ffi (1.9.18) formtastic (3.1.3) actionpack (>= 3.2.13) formtastic_i18n (0.5.0) @@ -170,6 +171,9 @@ GEM activesupport (>= 3.0) i18n polyamorous (~> 1.2) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) responders (2.1.1) railties (>= 4.2.0, < 5.1) rspec-core (3.6.0) @@ -189,9 +193,13 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - sass (3.4.21) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass (3.5.1) + 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.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -208,7 +216,7 @@ GEM power_assert thor (0.20.0) thread_safe (0.3.6) - tilt (2.0.2) + tilt (2.0.8) tzinfo (1.2.3) thread_safe (~> 0.1) uglifier (2.7.2) @@ -236,7 +244,7 @@ DEPENDENCIES rails_12factor rails_serve_static_assets rspec-rails (= 3.6.1) - sass-rails (~> 5.0.1) + sass-rails (~> 5.0) test-unit (~> 3.0) uglifier unicorn From a988a25ffd7b1f573b8d158a81b50f7b9a9704b9 Mon Sep 17 00:00:00 2001 From: DgDevill Date: Thu, 7 Sep 2017 16:06:45 +0200 Subject: [PATCH 5/7] travis config for 2.4.1 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c78ff2ca..7a83302c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.3.0 + - 2.4.1 env: - DEFAULT_MAILER_HOST=localhost:1080 SECRET_KEY_BASE=asecretkeybase CAMPAIGN_ENDED=false MAILER_SENDER=mailer@example.com services: @@ -12,4 +12,4 @@ before_script: script: - RAILS_ENV=test bundle exec rake db:migrate --trace - bundle exec rake db:test:prepare - - bundle exec rspec spec/ \ No newline at end of file + - bundle exec rspec spec/ From 83431440d80696816f84261fd53a26ffd6e320b5 Mon Sep 17 00:00:00 2001 From: Victor Mota Date: Mon, 6 Aug 2018 22:31:29 -0700 Subject: [PATCH 6/7] Fixes crashes described in issues/70 and updates ruby, rails and several other dependencies. Forked from DamnGoodDevill:latest_ruby PR branch. --- .ruby-version | 2 +- Gemfile | 14 +- Gemfile.lock | 257 ++++++++++++------------ app/assets/stylesheets/application.scss | 4 +- 4 files changed, 138 insertions(+), 139 deletions(-) diff --git a/.ruby-version b/.ruby-version index 005119baa..437459cd9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.1 +2.5.0 diff --git a/Gemfile b/Gemfile index cea35bf66..58500d152 100755 --- a/Gemfile +++ b/Gemfile @@ -1,20 +1,20 @@ source 'https://rubygems.org' -ruby '2.4.1' +ruby '2.5.0' -gem 'activeadmin', '1.0.0.pre2' -gem 'delayed_job_active_record', '~> 4.0.3' -gem 'devise' -gem 'pg' +gem 'activeadmin', '1.3.0' +gem 'delayed_job_active_record', '~> 4.1.3' +gem 'devise', '4.4.0' +gem 'pg', '~> 0.18' gem 'rails', '< 5.0' -gem 'unicorn' +gem 'unicorn', '5.4.1' # Gems used only for assets and not required # in production environments by default. group :assets do gem 'coffee-rails', '~> 4.1.0' - gem 'sass-rails', '~> 5.0' + gem 'sass-rails', '5.0.7' gem 'uglifier' end diff --git a/Gemfile.lock b/Gemfile.lock index ec310d8ae..6bcde6911 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,181 +1,183 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + 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.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + 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.9) - activesupport (= 4.2.9) + 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.3) - activeadmin (1.0.0.pre2) - arbre (~> 1.0, >= 1.0.2) - bourbon + activeadmin (1.3.0) + arbre (>= 1.1.1) coffee-rails formtastic (~> 3.1) formtastic_i18n - inherited_resources (~> 1.6) - jquery-rails - jquery-ui-rails - kaminari (~> 0.15) - rails (>= 3.2, < 5.0) + inherited_resources (>= 1.7.0) + jquery-rails (>= 4.2.0) + kaminari (>= 0.15) + railties (>= 4.2, < 5.3) ransack (~> 1.3) - sass-rails - activejob (4.2.9) - activesupport (= 4.2.9) + sass (~> 3.1) + sprockets (< 4.1) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.9) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arbre (1.0.3) + arbre (1.1.1) activesupport (>= 3.0.0) arel (6.0.4) - bcrypt (3.1.11) - bourbon (4.2.6) - sass (~> 3.4) - thor (~> 0.19) + bcrypt (3.1.12) builder (3.2.3) - coderay (1.1.1) + coderay (1.1.2) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - delayed_job (4.0.6) - activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.0.3) - activerecord (>= 3.0, < 5.0) - delayed_job (>= 3.0, < 4.1) - devise (3.5.6) + crass (1.0.4) + delayed_job (4.1.5) + activesupport (>= 3.0, < 5.3) + delayed_job_active_record (4.1.3) + activerecord (>= 3.0, < 5.3) + delayed_job (>= 3.0, < 5) + devise (4.4.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.2) responders - thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.3) - dotenv (2.1.0) - dotenv-rails (2.1.0) - dotenv (= 2.1.0) - railties (>= 4.0, < 5.1) + dotenv (2.5.0) + dotenv-rails (2.5.0) + dotenv (= 2.5.0) + railties (>= 3.2, < 6.0) erubis (2.7.0) - execjs (2.6.0) - ffi (1.9.18) - formtastic (3.1.3) + execjs (2.7.0) + ffi (1.9.25) + formtastic (3.1.5) actionpack (>= 3.2.13) - formtastic_i18n (0.5.0) - globalid (0.4.0) + formtastic_i18n (0.6.0) + globalid (0.4.1) activesupport (>= 4.2.0) - has_scope (0.6.0) - actionpack (>= 3.2, < 5) - activesupport (>= 3.2, < 5) - i18n (0.8.6) - inherited_resources (1.6.0) - actionpack (>= 3.2, < 5) - has_scope (~> 0.6.0.rc) - railties (>= 3.2, < 5) + has_scope (0.7.2) + actionpack (>= 4.1) + activesupport (>= 4.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + inherited_resources (1.8.0) + actionpack (>= 4.2, <= 5.2) + has_scope (~> 0.6) + railties (>= 4.2, <= 5.2) responders - jquery-rails (4.1.0) - rails-dom-testing (~> 1.0) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (2.1.0) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - loofah (2.0.3) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + kgio (2.11.2) + loofah (2.2.2) + 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) - minitest (5.10.3) - nokogiri (1.8.0) - 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.11.3) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) - pg (0.18.4) - polyamorous (1.3.0) + pg (0.21.0) + polyamorous (1.3.3) activerecord (>= 3.0) - power_assert (0.2.7) - pry (0.10.3) + power_assert (1.1.3) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rack (1.6.8) + method_source (~> 0.9.0) + rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + 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.9) + railties (= 4.2.10) 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.0.4) + loofah (~> 2.2, >= 2.2.2) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.5) - rails_stdout_logging (0.0.4) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + rails_stdout_logging (0.0.5) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.16.0) - rake (12.0.0) - ransack (1.7.0) + raindrops (0.19.0) + rake (12.3.1) + ransack (1.8.8) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.2) - rb-fsevent (0.10.2) + polyamorous (~> 1.3.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - responders (2.1.1) - railties (>= 4.2.0, < 5.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rspec-core (3.6.0) rspec-support (~> 3.6.0) rspec-expectations (3.6.0) @@ -193,64 +195,61 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - sass (3.5.1) + sass (3.5.7) 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.6) + 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) - slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - test-unit (3.1.7) + test-unit (3.2.8) power_assert thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unicorn (5.0.1) + uglifier (4.1.17) + execjs (>= 0.3.0, < 3) + unicorn (5.4.1) kgio (~> 2.6) - rack raindrops (~> 0.7) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) PLATFORMS ruby DEPENDENCIES - activeadmin (= 1.0.0.pre2) + activeadmin (= 1.3.0) coffee-rails (~> 4.1.0) - delayed_job_active_record (~> 4.0.3) - devise + delayed_job_active_record (~> 4.1.3) + devise (= 4.4.0) dotenv-rails - pg + pg (~> 0.18) pry rails (< 5.0) rails_12factor rails_serve_static_assets rspec-rails (= 3.6.1) - sass-rails (~> 5.0) + sass-rails (= 5.0.7) test-unit (~> 3.0) uglifier - unicorn + unicorn (= 5.4.1) RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.0p0 BUNDLED WITH - 1.16.0.pre.2 + 1.16.3 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 646f45f6a..619fd0e66 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,4 +1,4 @@ -@import "reset"; -@import "bootstrap"; +@import "reset.css"; +@import "bootstrap.css"; @import "core"; @import "users"; From 89f7772481c5c7de3d85f441d7719688858ac2d7 Mon Sep 17 00:00:00 2001 From: Victor Mota Date: Mon, 6 Aug 2018 22:42:16 -0700 Subject: [PATCH 7/7] Update coffee-rails to stay consistent with master branch. --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 58500d152..9b8636090 100755 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,8 @@ gem 'unicorn', '5.4.1' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'coffee-rails', '~> 4.1.0' - gem 'sass-rails', '5.0.7' + gem 'coffee-rails', '~> 4.2.2' + gem 'sass-rails', '~> 5.0.7' gem 'uglifier' end diff --git a/Gemfile.lock b/Gemfile.lock index 6bcde6911..00485ee02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,9 +53,9 @@ GEM bcrypt (3.1.12) builder (3.2.3) coderay (1.1.2) - coffee-rails (4.1.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs @@ -233,7 +233,7 @@ PLATFORMS DEPENDENCIES activeadmin (= 1.3.0) - coffee-rails (~> 4.1.0) + coffee-rails (~> 4.2.2) delayed_job_active_record (~> 4.1.3) devise (= 4.4.0) dotenv-rails @@ -243,7 +243,7 @@ DEPENDENCIES rails_12factor rails_serve_static_assets rspec-rails (= 3.6.1) - sass-rails (= 5.0.7) + sass-rails (~> 5.0.7) test-unit (~> 3.0) uglifier unicorn (= 5.4.1)