From b4f5446bc78a19af12fe1bf98c8fee30b44564eb Mon Sep 17 00:00:00 2001 From: JP Slavinsky Date: Mon, 12 Sep 2016 18:37:45 -0700 Subject: [PATCH 1/2] update rails version --- Gemfile | 2 +- Gemfile.lock | 89 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index b59f205..33164d7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.12' +gem 'rails', '~> 3.2.22' # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index 27c0bb2..828e3d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.22.4) + actionpack (= 3.2.22.4) + mail (~> 2.5.4) + actionpack (3.2.22.4) + activemodel (= 3.2.22.4) + activesupport (= 3.2.22.4) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,23 +14,23 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.22.4) + activesupport (= 3.2.22.4) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.22.4) + activemodel (= 3.2.22.4) + activesupport (= 3.2.22.4) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.22.4) + activemodel (= 3.2.22.4) + activesupport (= 3.2.22.4) + activesupport (3.2.22.4) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts-as-taggable-on (2.3.3) rails (~> 3.0) - arel (3.0.2) + arel (3.0.3) axlsx (2.0.1) htmlentities (~> 4.3.1) nokogiri (>= 1.4.1) @@ -86,27 +86,26 @@ GEM i18n (~> 0.4) gabba (1.0.1) highline (1.6.13) - hike (1.2.2) + hike (1.2.3) htmlentities (4.3.3) - i18n (0.6.4) + i18n (0.7.0) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.8.0) + json (1.8.3) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) libv8 (3.3.10.4) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) + mime-types (1.25.1) mini_portile (0.6.2) - multi_json (1.7.4) + multi_json (1.12.1) mysql2 (0.3.11) mysql2 (0.3.11-x86-mingw32) net-scp (1.0.4) @@ -131,35 +130,35 @@ GEM blankslate (~> 2.0) polyamorous (0.5.0) activerecord (~> 3.0) - polyglot (0.3.3) + polyglot (0.3.5) quiet_assets (1.0.1) railties (~> 3.1) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.6.1) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack rack-ssl-enforcer (0.2.4) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + rails (3.2.22.4) + actionmailer (= 3.2.22.4) + actionpack (= 3.2.22.4) + activerecord (= 3.2.22.4) + activeresource (= 3.2.22.4) + activesupport (= 3.2.22.4) bundler (~> 1.0) - railties (= 3.2.12) + railties (= 3.2.22.4) rails3-jquery-autocomplete (1.0.7) rails (~> 3.0) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (3.2.22.4) + actionpack (= 3.2.22.4) + activesupport (= 3.2.22.4) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) + rake (11.2.2) randumb (0.3.1) activerecord (>= 3.0.0) activesupport (>= 3.0.0) @@ -175,7 +174,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -193,13 +192,13 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.18.1) + thor (0.19.1) tilt (1.4.1) timecop (0.3.5) - treetop (1.4.12) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.51) uglifier (1.2.6) execjs (>= 0.3.0) multi_json (~> 1.3) @@ -236,7 +235,7 @@ DEPENDENCIES parslet (~> 1.4.0) quiet_assets (~> 1.0.1) rack-ssl-enforcer (~> 0.2.4) - rails (= 3.2.12) + rails (~> 3.2.22) rails3-jquery-autocomplete (~> 1.0.7) randumb (~> 0.3.1) recaptcha (~> 0.3.4) From 9b1530fbe58eca885d07cec553b29a13e47cb342 Mon Sep 17 00:00:00 2001 From: JP Slavinsky Date: Mon, 12 Sep 2016 18:41:53 -0700 Subject: [PATCH 2/2] travis to match dev ruby --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c801c73..8050b97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: ruby rvm: - - 1.9.2 + - 1.9.3-p194 env: # - DB=sqlite - DB=mysql @@ -17,4 +17,4 @@ script: - RAILS_ENV=test bundle exec rake --trace db:migrate test before_script: - gem install mysql2 - - mysql -e 'create database quadbase_test' \ No newline at end of file + - mysql -e 'create database quadbase_test'