From 2557f8fa000790a4d4da451d541ba8ce8d5c7609 Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Wed, 17 Jun 2015 14:19:13 +0100 Subject: [PATCH 1/3] Update rails to 4.1.11 and other gem updates too --- Gemfile | 2 +- Gemfile.lock | 284 +++++++++++++++++++++++++++------------------------ 2 files changed, 153 insertions(+), 133 deletions(-) diff --git a/Gemfile b/Gemfile index fc32984..533f657 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby "2.1.4" #ruby-gemset=forkbomb # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.0.2' +gem 'rails', '~> 4.1.11' gem 'dotenv-rails' diff --git a/Gemfile.lock b/Gemfile.lock index ee6095a..cb830cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.12) - actionpack (= 4.0.12) + actionmailer (4.1.11) + actionpack (= 4.1.11) + actionview (= 4.1.11) mail (~> 2.5, >= 2.5.4) - actionpack (4.0.12) - activesupport (= 4.0.12) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionpack (4.1.11) + actionview (= 4.1.11) + activesupport (= 4.1.11) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.12) - activesupport (= 4.0.12) - builder (~> 3.1.0) - activerecord (4.0.12) - activemodel (= 4.0.12) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.12) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.12) + actionview (4.1.11) + activesupport (= 4.1.11) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.11) + activesupport (= 4.1.11) + builder (~> 3.1) + activerecord (4.1.11) + activemodel (= 4.1.11) + activesupport (= 4.1.11) + arel (~> 5.0.0) + activesupport (4.1.11) i18n (~> 0.6, >= 0.6.9) - minitest (~> 4.2) - multi_json (~> 1.3) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - addressable (2.3.6) - arel (4.0.2) + tzinfo (~> 1.1) + addressable (2.3.8) + arel (5.0.1.20140414130214) backports (3.6.4) - bcrypt (3.1.9) + bcrypt (3.1.10) bootstrap-sass (3.0.3.0) sass (~> 3.2) bootstrap-switch-rails (1.9.0) - builder (3.1.4) + builder (3.2.2) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -46,39 +48,39 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor + coffee-script-source (1.9.1.1) + coveralls (0.8.1) + json (~> 1.8) + rest-client (>= 1.6.8, < 2) + simplecov (~> 0.10.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) crack (0.4.2) safe_yaml (~> 1.0.0) - cucumber (1.3.17) + cucumber (1.3.19) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) + multi_test (>= 0.1.2) cucumber-rails (1.4.2) capybara (>= 1.1.2, < 3) cucumber (>= 1.3.8, < 2) mime-types (>= 1.16, < 3) nokogiri (~> 1.5) rails (>= 3, < 5) - database_cleaner (1.3.0) - delayed_job (4.0.4) - activesupport (>= 3.0, < 4.2) - delayed_job_active_record (4.0.2) - activerecord (>= 3.0, < 4.2) + database_cleaner (1.4.1) + 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) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.4.1) + devise (3.5.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -87,27 +89,29 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) - dotenv (1.0.2) - dotenv-rails (1.0.2) - dotenv (= 1.0.2) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.0.1) + dotenv-rails (2.0.1) + dotenv (= 2.0.1) erubis (2.7.0) - ethon (0.7.1) + ethon (0.7.3) ffi (>= 1.3.0) - execjs (2.2.2) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) factory_girl (~> 4.5.0) railties (>= 3.0.0) - faraday (0.9.0) + faraday (0.9.1) multipart-post (>= 1.2, < 3) faraday_middleware (0.9.1) faraday (>= 0.7.4, < 0.10) - ffi (1.9.6) - font-awesome-rails (4.0.3.0) + ffi (1.9.8) + font-awesome-rails (4.0.3.2) railties (>= 3.2, < 5.0) formatador (0.2.5) - gh (0.13.2) + gh (0.14.0) addressable backports faraday (~> 0.8) @@ -116,7 +120,7 @@ GEM net-http-pipeline gherkin (2.12.2) multi_json (~> 1.3) - github_api (0.12.2) + github_api (0.12.3) addressable (~> 2.3) descendants_tracker (~> 0.0.4) faraday (~> 0.8, < 0.10) @@ -124,60 +128,66 @@ GEM multi_json (>= 1.7.5, < 2.0) nokogiri (~> 1.6.3) oauth2 - guard (2.10.4) + guard (2.12.6) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) nenv (~> 0.1) + notiffany (~> 0.0) pry (>= 0.9.12) + shellany (~> 0.0) thor (>= 0.18.1) - guard-compat (1.1.0) - guard-cucumber (1.5.3) + guard-compat (1.2.1) + guard-cucumber (1.5.4) cucumber (>= 1.3.0) - guard (>= 2.0.0) guard-compat (~> 1.0) nenv (~> 0.1) - guard-rspec (4.5.0) + guard-rspec (4.5.2) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hashie (3.3.2) - highline (1.6.21) + hashie (3.4.2) + highline (1.7.2) hike (1.2.3) hitimes (1.2.2) - i18n (0.6.11) + http-cookie (1.0.2) + domain_name (~> 0.5) + i18n (0.7.0) jbuilder (1.5.3) activesupport (>= 3.0.0) multi_json (>= 1.2.0) - jquery-rails (3.1.2) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) - jwt (1.2.0) - kramdown (1.5.0) + json (1.8.3) + jwt (1.5.0) + kramdown (1.7.0) launchy (2.4.3) addressable (~> 2.3) - listen (2.8.3) - celluloid (>= 0.15.2) + listen (2.10.1) + celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.9) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.1) - minitest (4.7.5) - multi_json (1.10.1) - multi_test (0.1.1) + mime-types (2.6.1) + mini_portile (0.6.2) + minitest (5.7.0) + multi_json (1.11.1) + multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - nenv (0.1.1) + nenv (0.2.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) - netrc (0.10.1) - nokogiri (1.6.5) + netrc (0.10.3) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) + notiffany (0.0.6) + nenv (~> 0.1) + shellany (~> 0.0) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -190,80 +200,82 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) - multi_json (~> 1.3) + omniauth-oauth2 (1.3.0) oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) - pg (0.17.1) - poltergeist (1.5.1) + pg (0.18.2) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) + pry (0.9.12.6) + coderay (~> 1.0) + method_source (~> 0.8) slop (~> 3.4) - pusher-client (0.6.0) + pusher-client (0.6.2) json websocket (~> 1.0) - rack (1.5.2) + rack (1.5.4) rack-google-analytics (1.2.0) actionpack activesupport - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.12) - actionmailer (= 4.0.12) - actionpack (= 4.0.12) - activerecord (= 4.0.12) - activesupport (= 4.0.12) + rails (4.1.11) + actionmailer (= 4.1.11) + actionpack (= 4.1.11) + actionview (= 4.1.11) + activemodel (= 4.1.11) + activerecord (= 4.1.11) + activesupport (= 4.1.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.12) + railties (= 4.1.11) sprockets-rails (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.2) + rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.0.12) - actionpack (= 4.0.12) - activesupport (= 4.0.12) + railties (4.1.11) + actionpack (= 4.1.11) + activesupport (= 4.1.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - rb-fsevent (0.9.4) + rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) rdoc (4.2.0) json (~> 1.4) responders (1.1.2) railties (>= 3.2, < 4.2) - rest-client (1.7.2) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rspec (3.3.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-core (3.3.0) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) + rspec-support (~> 3.3.0) + rspec-mocks (3.3.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-rails (3.3.1) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.5) @@ -274,18 +286,19 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - simplecov (0.9.1) + shellany (0.0.1) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slop (3.6.0) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.3.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -293,41 +306,45 @@ GEM term-ansicolor (1.3.0) tins (~> 1.0) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.1) + timecop (0.7.4) timers (4.0.1) hitimes - tins (1.3.3) - travis (1.6.11) + tins (1.5.2) + travis (1.7.7) addressable (~> 2.3) backports faraday (~> 0.9) - faraday_middleware (~> 0.9) + faraday_middleware (~> 0.9, >= 0.9.1) gh (~> 0.13) highline (~> 1.6) launchy (~> 2.1) - pry (~> 0.9) + pry (~> 0.9, < 0.10) pusher-client (~> 0.4) typhoeus (~> 0.6, >= 0.6.8) turbolinks (2.5.3) coffee-rails - typhoeus (0.6.9) + typhoeus (0.7.1) ethon (>= 0.7.1) - tzinfo (0.3.42) - uglifier (2.6.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) vcr (2.9.3) warden (1.2.3) rack (>= 1.0) - webmock (1.20.4) + webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket (1.2.1) - websocket-driver (0.5.0) + websocket (1.2.2) + websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.1) + websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) @@ -358,7 +375,7 @@ DEPENDENCIES pg poltergeist rack-google-analytics - rails (~> 4.0.2) + rails (~> 4.1.11) rails_12factor rspec-rails sass-rails (~> 4.0.0) @@ -370,3 +387,6 @@ DEPENDENCIES uglifier (>= 1.3.0) vcr webmock + +BUNDLED WITH + 1.10.4 From 27fa7e44d2eb196ef14120610feeda090d55ee3e Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Wed, 17 Jun 2015 16:38:54 +0100 Subject: [PATCH 2/3] Run migrations before tests --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f2172c4..d2cb731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ sudo: false cache: bundler +script: + - RAILS_ENV=test bundle exec rake --trace db:migrate default after_success: - '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && curl -v -X DELETE -u $GITHUB_USER:$GITHUB_PASSWORD "https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs/tags/CURRENT"' From af28bd87d54e595f856bb4e5d783fa4dde562185 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sat, 8 Jul 2017 23:06:45 +0000 Subject: [PATCH 3/3] Bump rails to 4.1.16 Bumps [rails](https://github.com/rails/rails) from 4.0.12 to 4.1.16. - [Commits](https://github.com/rails/rails/commits) I'll automatically resolve any conflicts with this PR as long as you don't alter it yourself. If you'd like to skip this version, you can just close this PR. If you have any feedback just mention @dependabot in the comments below. --- Gemfile | 2 +- Gemfile.lock | 85 +++++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index 314279f..a73ab97 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby "2.1.10" #ruby-gemset=forkbomb # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.0.2' +gem 'rails', '~> 4.1.16' gem 'dotenv-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 44d0571..d3bc4f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.12) - actionpack (= 4.0.12) + actionmailer (4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) mail (~> 2.5, >= 2.5.4) - actionpack (4.0.12) - activesupport (= 4.0.12) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionpack (4.1.16) + actionview (= 4.1.16) + activesupport (= 4.1.16) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.12) - activesupport (= 4.0.12) - builder (~> 3.1.0) - activerecord (4.0.12) - activemodel (= 4.0.12) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.12) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.4) - activesupport (4.0.12) + actionview (4.1.16) + activesupport (= 4.1.16) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.16) + activesupport (= 4.1.16) + builder (~> 3.1) + activerecord (4.1.16) + activemodel (= 4.1.16) + activesupport (= 4.1.16) + arel (~> 5.0.0) + activesupport (4.1.16) i18n (~> 0.6, >= 0.6.9) - minitest (~> 4.2) - multi_json (~> 1.3) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) + tzinfo (~> 1.1) addressable (2.4.0) - arel (4.0.2) + arel (5.0.1.20140414130214) backports (3.8.0) bcrypt (3.1.9) bootstrap-sass (3.0.3.0) sass (~> 3.2) bootstrap-switch-rails (1.9.0) - builder (3.1.4) + builder (3.2.3) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -146,7 +148,7 @@ GEM highline (1.7.8) hike (1.2.3) hitimes (1.2.2) - i18n (0.8.4) + i18n (0.8.5) jbuilder (2.6.4) activesupport (>= 3.0.0) multi_json (>= 1.2) @@ -163,12 +165,12 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.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.3) mini_portile2 (2.1.0) - minitest (4.7.5) + minitest (5.10.2) multi_json (1.12.1) multi_test (0.1.1) multi_xml (0.6.0) @@ -211,27 +213,29 @@ GEM rack-google-analytics (1.2.0) actionpack activesupport - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.12) - actionmailer (= 4.0.12) - actionpack (= 4.0.12) - activerecord (= 4.0.12) - activesupport (= 4.0.12) + rails (4.1.16) + actionmailer (= 4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) + activemodel (= 4.1.16) + activerecord (= 4.1.16) + activesupport (= 4.1.16) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.12) + railties (= 4.1.16) sprockets-rails (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.2) rails_stdout_logging (0.0.3) - railties (4.0.12) - actionpack (= 4.0.12) - activesupport (= 4.0.12) + railties (4.1.16) + actionpack (= 4.1.16) + activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (12.0.0) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -274,12 +278,12 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.1) slop (3.6.0) - sprockets (2.12.3) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -306,7 +310,8 @@ GEM coffee-rails typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (0.3.53) + tzinfo (1.2.3) + thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) vcr (3.0.3) @@ -350,7 +355,7 @@ DEPENDENCIES pg poltergeist rack-google-analytics - rails (~> 4.0.2) + rails (~> 4.1.16) rails_12factor rspec-rails sass-rails (~> 4.0.0)