From c05a2ad583a5f6644785dfd2b4ac529d8453f68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 11:58:12 +0200 Subject: [PATCH 1/9] Do not lock rails-i18n in Gemfile There is not reason to not use new versions of rails-i18n. Update to last version 1.6.0. --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index d74ba069..11abbcfe 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'carrierwave-bombshelter' gem 'mini_magick' # for internationalizing -gem 'rails-i18n', '~> 5.0.0' +gem 'rails-i18n' # as authentification framework gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index dd5ee7d7..6ea92cb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,7 @@ GEM htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) i18n_data (0.8.0) inversion (1.1.1) @@ -422,9 +422,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.0.4) - i18n (~> 0.7) - railties (~> 5.0) + rails-i18n (5.1.3) + i18n (>= 0.7, < 2) + railties (>= 5.0, < 6) railties (5.0.7.2) actionpack (= 5.0.7.2) activesupport (= 5.0.7.2) @@ -685,7 +685,7 @@ DEPENDENCIES rails-assets-trianglify! rails-assets-waypoints! rails-controller-testing - rails-i18n (~> 5.0.0) + rails-i18n rdoc-generator-fivefish recaptcha redcarpet @@ -722,4 +722,4 @@ RUBY VERSION ruby 2.5.0p0 BUNDLED WITH - 1.17.1 + 1.17.3 From 66626ce478d2328c368722c29d67af8f17d1f5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 13:10:53 +0200 Subject: [PATCH 2/9] Do not lock awesome_nested_set in Gemfile There is not reason to not use new versions of awesome_nested_set. --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 11abbcfe..3d76b568 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem 'transitions', :require => %w( transitions active_record/transitions ) # for comments gem 'acts_as_commentable_with_threading' -gem 'awesome_nested_set', '~> 3.1.3' +gem 'awesome_nested_set' # as templating language gem 'haml-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 6ea92cb7..bce300a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -610,7 +610,7 @@ DEPENDENCIES airbrake (~> 7.1) ajax-datatables-rails autoprefixer-rails - awesome_nested_set (~> 3.1.3) + awesome_nested_set axlsx! axlsx_rails bootstrap-sass (~> 3.4.0) From 1c8fa62fbca8d9a7a3ac9cacfda535d59bb6d75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 13:17:28 +0200 Subject: [PATCH 3/9] Remove thor from Gemfile thor was set to 1.19.1 because of a bug, but it is not longer needed: https://github.com/openSUSE/osem/issues/1664 --- Gemfile | 2 -- Gemfile.lock | 1 - 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3d76b568..f12826cc 100644 --- a/Gemfile +++ b/Gemfile @@ -87,8 +87,6 @@ gem 'jquery-ui-rails', '~> 4.2.1' # for languages validation gem 'iso-639' -gem 'thor', '~> 0.19' - # frontend javascripts source 'https://rails-assets.org' do # for placeholder images diff --git a/Gemfile.lock b/Gemfile.lock index bce300a9..fe913a87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -707,7 +707,6 @@ DEPENDENCIES sqlite3 stripe stripe-ruby-mock - thor (~> 0.19) timecop transactional_capybara transitions From 6c50723bf19c7b300212abdd0f1d11d1ad53b78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 14:39:17 +0200 Subject: [PATCH 4/9] Do not lock prawn-qrcode in Gemfile There is not reason to not use new versions of prawn-qrcode. --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index f12826cc..6deb806b 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ gem 'gravtastic' gem 'country_select' # as PDF generator -gem 'prawn-qrcode', '~> 0.3.0' +gem 'prawn-qrcode' gem 'prawn_rails' gem 'rqrcode' diff --git a/Gemfile.lock b/Gemfile.lock index fe913a87..350486b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -668,7 +668,7 @@ DEPENDENCIES pdf-inspector pg piwik_analytics (~> 1.0.1) - prawn-qrcode (~> 0.3.0) + prawn-qrcode prawn_rails puma (~> 3.0) rails (~> 5.0.7) From 7dd6afbb579a2462bdf03f81e5723a8027660165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 14:40:53 +0200 Subject: [PATCH 5/9] Do not lock cancancan in Gemfile There is not reason to not use new versions of cancancan. --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 6deb806b..6a48d245 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem 'omniauth-openid' gem 'recaptcha', require: 'recaptcha/rails' # as authorization framework -gem 'cancancan', '~> 2.0' +gem 'cancancan' # for roles gem 'rolify' diff --git a/Gemfile.lock b/Gemfile.lock index 350486b9..07cdc887 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -617,7 +617,7 @@ DEPENDENCIES bootstrap-switch-rails (~> 3.0.0) bootstrap3-datetimepicker-rails (~> 4.17.47) byebug - cancancan (~> 2.0) + cancancan capybara carrierwave carrierwave-bombshelter From dc12674eba7d3f4a5cc442161dc86f55478dbaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 14:43:58 +0200 Subject: [PATCH 6/9] Do not lock airbrake in Gemfile There is not reason to not use new versions of airbrake. Update to last version 9.0.0. --- Gemfile | 2 +- Gemfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 6a48d245..2ceb7f20 100644 --- a/Gemfile +++ b/Gemfile @@ -142,7 +142,7 @@ gem 'axlsx', git: 'https://github.com/randym/axlsx.git' gem 'axlsx_rails' # as error catcher -gem 'airbrake', '~> 7.1' +gem 'airbrake' # to make links faster gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index 07cdc887..46e77623 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,9 +64,10 @@ GEM addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) afm (0.2.2) - airbrake (7.4.0) - airbrake-ruby (~> 2.12) - airbrake-ruby (2.12.0) + airbrake (9.0.0) + airbrake-ruby (~> 4.2) + airbrake-ruby (4.2.2) + rbtree3 (~> 0.5) ajax-datatables-rails (0.4.3) railties (>= 4.0) archive-zip (0.12.0) @@ -436,6 +437,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) + rbtree3 (0.5.0) rdoc (6.0.4) rdoc-generator-fivefish (0.4.0) inversion (~> 1.1) @@ -607,7 +609,7 @@ DEPENDENCIES active_model_serializers acts_as_commentable_with_threading acts_as_list - airbrake (~> 7.1) + airbrake ajax-datatables-rails autoprefixer-rails awesome_nested_set From 7fd5f5b4f94fa9d514c605c0baf49b85be4a90ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 14:57:33 +0200 Subject: [PATCH 7/9] Do not lock ruby-oembed in Gemfile There is not reason to not use new versions of ruby-oembed. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2ceb7f20..6fdde962 100644 --- a/Gemfile +++ b/Gemfile @@ -179,7 +179,7 @@ gem 'acts_as_list' gem 'bootstrap-switch-rails', '~> 3.0.0' # for parsing OEmbed data -gem 'ruby-oembed', '~>0.12.0' +gem 'ruby-oembed' # for uploading images to the cloud gem 'cloudinary' From 9c2d7cfa5dd9996ba5e0c27f62e00382624207aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 15:04:16 +0200 Subject: [PATCH 8/9] Do not lock web-console in Gemfile There is not reason to not use new versions of web-console. Update to last version 3.7.0. --- Gemfile | 2 +- Gemfile.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 6fdde962..c9f25179 100644 --- a/Gemfile +++ b/Gemfile @@ -234,7 +234,7 @@ group :development do # as deployment system gem 'mina' # as debugger on error pages - gem 'web-console', '~> 2.0' + gem 'web-console' # as development database gem 'sqlite3' end diff --git a/Gemfile.lock b/Gemfile.lock index 46e77623..0ba73ee2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,8 +83,7 @@ GEM actionpack (>= 3.1) axlsx (>= 2.0.1) bcrypt (3.1.12) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) + bindex (0.6.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -148,7 +147,6 @@ GEM dalli (2.7.10) dante (0.2.0) database_cleaner (1.7.0) - debug_inspector (0.0.3) delayed_job (4.1.5) activesupport (>= 3.0, < 5.3) delayed_job_active_record (4.1.3) @@ -584,11 +582,11 @@ GEM url (0.3.2) warden (1.2.8) rack (>= 2.0.6) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -698,7 +696,7 @@ DEPENDENCIES rspec-rails rubocop rubocop-rspec - ruby-oembed (~> 0.12.0) + ruby-oembed sass-rails (>= 4.0.2) selectize-rails selenium-webdriver @@ -715,7 +713,7 @@ DEPENDENCIES turbolinks uglifier (>= 1.3.0) unobtrusive_flash (>= 3) - web-console (~> 2.0) + web-console webmock whenever From ad5637e0a409a061dfcca111627b7dbcdc77b4de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Mon, 1 Apr 2019 15:07:28 +0200 Subject: [PATCH 9/9] Do not lock countable-rails in Gemfile There is not reason to not use new versions of countable-rails. --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c9f25179..a1e081f6 100644 --- a/Gemfile +++ b/Gemfile @@ -192,7 +192,7 @@ gem 'dotenv-rails' gem 'feature' # For countable.js -gem "countable-rails", "~> 0.0.1" +gem "countable-rails" # Both are not in a group as we use it also for rake data:demo # for fake data diff --git a/Gemfile.lock b/Gemfile.lock index 0ba73ee2..ebb1e187 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -627,7 +627,7 @@ DEPENDENCIES cloudinary cocoon codecov - countable-rails (~> 0.0.1) + countable-rails country_select daemons dalli