From 8824c86ea19fc5c62931443d00f68a7060f29049 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Tue, 15 Mar 2016 01:09:29 -0500 Subject: [PATCH 1/3] Bump saas Rails to 4.2.4 --- Gemfile.lock | 2 +- vendor/engines/saas/Gemfile.lock | 95 ++++++++++++++++---------------- vendor/engines/saas/saas.gemspec | 2 +- 3 files changed, 51 insertions(+), 48 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e849daff..dd66dc72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: saas (0.0.1) analytics-ruby - rails (~> 4.2.0) + rails (~> 4.2.4) PATH remote: vendor/gems/faye_extensions diff --git a/vendor/engines/saas/Gemfile.lock b/vendor/engines/saas/Gemfile.lock index d56fc77e..78950464 100644 --- a/vendor/engines/saas/Gemfile.lock +++ b/vendor/engines/saas/Gemfile.lock @@ -2,93 +2,93 @@ PATH remote: . specs: saas (0.0.1) - rails (~> 4.2.0) + rails (~> 4.2.4) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) + rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.0) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.0) + arel (6.0.3) builder (3.2.2) erubis (2.7.0) - globalid (0.3.3) + globalid (0.3.6) activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) json (1.8.2) - loofah (2.0.1) + loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.4.3) - mini_portile (0.6.2) - minitest (5.5.1) + mime-types (2.99.1) + mini_portile2 (2.0.0) + minitest (5.8.4) multi_json (1.10.1) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - rack (1.6.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - sprockets (2.12.3) + rake (10.5.0) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -108,3 +108,6 @@ PLATFORMS DEPENDENCIES saas! + +BUNDLED WITH + 1.11.2 diff --git a/vendor/engines/saas/saas.gemspec b/vendor/engines/saas/saas.gemspec index 74d918fb..707c85a5 100644 --- a/vendor/engines/saas/saas.gemspec +++ b/vendor/engines/saas/saas.gemspec @@ -17,6 +17,6 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] s.test_files = Dir["test/**/*"] - s.add_dependency "rails", "~> 4.2.0" + s.add_dependency "rails", "~> 4.2.4" s.add_dependency 'analytics-ruby' end From 1eadbaf9d738a7988ea2d25c9cc4a755b2d57745 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Tue, 15 Mar 2016 01:09:36 -0500 Subject: [PATCH 2/3] Misc Gem version sync --- vendor/engines/saas/Gemfile.lock | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/vendor/engines/saas/Gemfile.lock b/vendor/engines/saas/Gemfile.lock index 78950464..62d72a5e 100644 --- a/vendor/engines/saas/Gemfile.lock +++ b/vendor/engines/saas/Gemfile.lock @@ -2,6 +2,7 @@ PATH remote: . specs: saas (0.0.1) + analytics-ruby rails (~> 4.2.4) GEM @@ -42,6 +43,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + analytics-ruby (2.0.13) arel (6.0.3) builder (3.2.2) erubis (2.7.0) @@ -49,7 +51,7 @@ GEM activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) - json (1.8.2) + json (1.8.3) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) @@ -57,7 +59,7 @@ GEM mime-types (2.99.1) mini_portile2 (2.0.0) minitest (5.8.4) - multi_json (1.10.1) + multi_json (1.11.2) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) rack (1.6.4) @@ -93,12 +95,12 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.0.0.beta1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (~> 2.8) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) tzinfo (1.2.2) thread_safe (~> 0.1) From 2ccabba5e6252402ef416e0a3e9bed2240ad479b Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Tue, 15 Mar 2016 13:41:30 -0500 Subject: [PATCH 3/3] Pin jQuery version due to Ember bug https://github.com/ember-cli/ember-cli/issues/5316 --- ember-app/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-app/bower.json b/ember-app/bower.json index f749755e..ec04c785 100644 --- a/ember-app/bower.json +++ b/ember-app/bower.json @@ -1,7 +1,7 @@ { "name": "huboard", "dependencies": { - "jquery": "^1.11.1", + "jquery": "1.11.3", "ember": "1.13.8", "ember-resolver": "~0.1.12", "loader.js": "ember-cli/loader.js#3.2.0",