From 15b49672ee715c37057a29e52b1bb2571a7ba542 Mon Sep 17 00:00:00 2001 From: Cesy Avon Date: Thu, 8 Jun 2017 16:12:36 +0000 Subject: [PATCH 1/4] Removing any locks on versions that don't have comments explaining why --- Gemfile | 28 ++++++++++++++-------------- Gemfile.lock | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Gemfile b/Gemfile index 59adddd53..54ffaa0ee 100644 --- a/Gemfile +++ b/Gemfile @@ -7,22 +7,22 @@ gem 'rails', '~> 4.2.8' gem 'bundler', '>=1.1.5' -gem 'coffee-rails', '~> 4.1.0' -gem 'haml', '~> 4.0.7' -gem 'sass-rails', '~> 5.0.4' +gem 'coffee-rails' +gem 'haml' +gem 'sass-rails' # CSS framework -gem 'bootstrap-sass', '~> 3.3.6' +gem 'bootstrap-sass' gem 'font-awesome-sass' -gem 'uglifier', '~> 2.7.2' # JavaScript compressor +gem 'uglifier' # JavaScript compressor gem 'flickraw' gem 'jquery-rails' -gem 'jquery-ui-rails', '~> 5.0.2' +gem 'jquery-ui-rails' gem 'js-routes' # provides access to Rails routes in Javascript -gem 'cancancan', '~> 1.9' # for checking member privileges +gem 'cancancan' # for checking member privileges gem 'csv_shaper' # CSV export gem 'figaro' # for handling config via ENV variables gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions @@ -32,10 +32,10 @@ gem 'pg' gem 'ruby-units' # for unit conversion gem 'unicorn' # http server -gem 'comfortable_mexican_sofa', '~> 1.12.0' # content management system +gem 'comfortable_mexican_sofa' # content management system gem 'bootstrap-kaminari-views' # bootstrap views for kaminari -gem 'kaminari', '~> 0.17.0' # pagination +gem 'kaminari' # pagination gem 'activemerchant' gem 'active_utils' @@ -45,13 +45,13 @@ gem 'sidekiq' gem 'bluecloth' # Pagination -gem 'will_paginate', '~> 3.0' +gem 'will_paginate' # user signup/login/etc -gem 'devise', '>= 4.0.0' +gem 'devise' # nicely formatted URLs -gem 'friendly_id', '~> 5.0.4' +gem 'friendly_id' # gravatars gem 'gravatar-ultimate' @@ -66,7 +66,7 @@ gem 'bootstrap-datepicker-rails' gem 'omniauth', '~> 1.3' gem 'omniauth-facebook' gem 'omniauth-flickr', '>= 0.0.15' -gem 'omniauth-twitter', '~> 1.2' +gem 'omniauth-twitter' # For charting data gem 'd3-rails', '~> 3.5' # 4.* produces Error: : could not find an object to spy upon for linear() - see https://travis-ci.org/Growstuff/growstuff/jobs/204461482 @@ -121,7 +121,7 @@ group :development, :test do gem 'capybara-email' # integration tests for email gem 'capybara-screenshot' # for test debugging gem 'coveralls', require: false # coverage analysis - gem 'database_cleaner', '~> 1.5.0' + gem 'database_cleaner' gem 'factory_girl_rails' # for creating test data gem 'haml-i18n-extractor' gem 'haml-rails' # HTML templating language diff --git a/Gemfile.lock b/Gemfile.lock index 95feb5aa1..8c30f6439 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -524,23 +524,23 @@ DEPENDENCIES bonsai-elasticsearch-rails bootstrap-datepicker-rails bootstrap-kaminari-views - bootstrap-sass (~> 3.3.6) + bootstrap-sass bullet bundler (>= 1.1.5) byebug - cancancan (~> 1.9) + cancancan capybara capybara-email capybara-screenshot codeclimate-test-reporter - coffee-rails (~> 4.1.0) - comfortable_mexican_sofa (~> 1.12.0) + coffee-rails + comfortable_mexican_sofa coveralls csv_shaper d3-rails (~> 3.5) dalli - database_cleaner (~> 1.5.0) - devise (>= 4.0.0) + database_cleaner + devise elasticsearch-api (~> 2.0.0) elasticsearch-model elasticsearch-rails @@ -548,13 +548,13 @@ DEPENDENCIES figaro flickraw font-awesome-sass - friendly_id (~> 5.0.4) + friendly_id geocoder gibbon (~> 1.2.0) gravatar-ultimate guard guard-rspec - haml (~> 4.0.7) + haml haml-i18n-extractor haml-rails haml_lint @@ -563,9 +563,9 @@ DEPENDENCIES i18n-tasks jasmine jquery-rails - jquery-ui-rails (~> 5.0.2) + jquery-ui-rails js-routes - kaminari (~> 0.17.0) + kaminari leaflet-markercluster-rails leaflet-rails (~> 0.7.7) letter_opener @@ -574,7 +574,7 @@ DEPENDENCIES omniauth (~> 1.3) omniauth-facebook omniauth-flickr (>= 0.0.15) - omniauth-twitter (~> 1.2) + omniauth-twitter pg poltergeist pry @@ -588,15 +588,15 @@ DEPENDENCIES rspec-rails rubocop (<= 0.47.1) ruby-units - sass-rails (~> 5.0.4) + sass-rails selenium-webdriver sidekiq sparkpost_rails timecop - uglifier (~> 2.7.2) + uglifier unicorn webrat - will_paginate (~> 3.0) + will_paginate RUBY VERSION From 6f6e0a58a35483f7f8e764a7f62d5d98cefcc255 Mon Sep 17 00:00:00 2001 From: Cesy Avon Date: Thu, 8 Jun 2017 16:17:02 +0000 Subject: [PATCH 2/4] Bundle update --- Gemfile.lock | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8c30f6439..b046bc6aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) byebug (9.0.6) - cancancan (1.17.0) + cancancan (2.0.0) capybara (2.14.3) addressable mime-types (>= 1.16) @@ -107,9 +107,9 @@ GEM codemirror-rails (5.16.0) railties (>= 3.0, < 6.0) coderay (1.1.1) - 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 @@ -142,7 +142,7 @@ GEM d3-rails (3.5.17) railties (>= 3.1) dalli (2.7.6) - database_cleaner (1.5.3) + database_cleaner (1.6.1) debug_inspector (0.0.3) devise (4.3.0) bcrypt (~> 3.0) @@ -186,7 +186,7 @@ GEM font-awesome-sass (4.7.0) sass (>= 3.2) formatador (0.2.5) - friendly_id (5.0.5) + friendly_id (5.2.1) activerecord (>= 4.0.0) geocoder (1.4.4) gibbon (1.2.1) @@ -211,7 +211,8 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (4.0.7) + haml (5.0.1) + temple (>= 0.8.0) tilt haml-i18n-extractor (0.5.9) activesupport @@ -264,16 +265,25 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) js-routes (1.3.3) railties (>= 3.2) sprockets-rails json (2.1.0) jwt (1.5.6) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) kgio (2.11.0) kramdown (1.13.2) launchy (2.4.3) @@ -476,6 +486,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sysexits (1.2.0) + temple (0.8.0) term-ansicolor (1.6.0) tins (~> 1.0) terminal-table (1.8.0) @@ -489,9 +500,8 @@ GEM trollop (1.16.2) tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) unicode-display_width (1.2.1) unicorn (5.3.0) kgio (~> 2.6) From 5788c0c5ce3f130eb9c280d1191da681e465be6f Mon Sep 17 00:00:00 2001 From: Cesy Avon Date: Thu, 8 Jun 2017 16:33:03 +0000 Subject: [PATCH 3/4] Putting jquery-ui-rails back so things work --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 54ffaa0ee..3e2841ff2 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'uglifier' # JavaScript compressor gem 'flickraw' gem 'jquery-rails' -gem 'jquery-ui-rails' +gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location gem 'js-routes' # provides access to Rails routes in Javascript gem 'cancancan' # for checking member privileges diff --git a/Gemfile.lock b/Gemfile.lock index b046bc6aa..5397e4f70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) + jquery-ui-rails (5.0.5) railties (>= 3.2.16) js-routes (1.3.3) railties (>= 3.2) @@ -573,7 +573,7 @@ DEPENDENCIES i18n-tasks jasmine jquery-rails - jquery-ui-rails + jquery-ui-rails (~> 5.0.2) js-routes kaminari leaflet-markercluster-rails From 4116e201b5e22bb5dbcfaa5c57fc7e4a215e936e Mon Sep 17 00:00:00 2001 From: Cesy Avon Date: Thu, 15 Jun 2017 15:04:57 +0000 Subject: [PATCH 4/4] Making rubocop happy --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3e2841ff2..f93c2a801 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'uglifier' # JavaScript compressor gem 'flickraw' gem 'jquery-rails' -gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location +gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location gem 'js-routes' # provides access to Rails routes in Javascript gem 'cancancan' # for checking member privileges