From cf0eec6cd6c487956f762b88d90fe71597a22703 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 24 May 2018 16:36:17 +0200 Subject: [PATCH 1/3] Remove the fixed version for guard-livereload --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 456da8de1..f372d3936 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ group :test do gem 'timecop' gem 'guard' gem 'guard-rspec', require: false - gem 'guard-livereload', '~> 2.4', require: false + gem 'guard-livereload', require: false gem 'vcr' gem 'rails-controller-testing' end diff --git a/Gemfile.lock b/Gemfile.lock index bac604e89..822ad10eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -195,7 +195,7 @@ GEM erubis (2.7.0) ethon (0.11.0) ffi (>= 1.3.0) - eventmachine (1.2.5) + eventmachine (1.2.7) excon (0.60.0) execjs (2.7.0) factory_bot (4.8.2) @@ -458,7 +458,7 @@ GEM loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.12) + lumberjack (1.0.13) mail (2.7.0) mini_mime (>= 0.1.1) mailjet (1.5.4) @@ -811,7 +811,7 @@ DEPENDENCIES fog-openstack font-awesome-rails guard - guard-livereload (~> 2.4) + guard-livereload guard-rspec haml-lint haml-rails From 5a880b56634359de3d088740b93679dd48754770 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 24 May 2018 16:42:50 +0200 Subject: [PATCH 2/3] Remove constraint on uglifier --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index f372d3936..18b6ed1c4 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'rails', '~> 5.2.0' # Use SCSS for stylesheets gem 'sass-rails' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', platforms: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index 822ad10eb..217d3ae39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -861,7 +861,7 @@ DEPENDENCIES timecop turbolinks typhoeus - uglifier (>= 1.3.0) + uglifier unicode_utils unicorn vcr From a8ac59dd4c7266c84f632e84d965a1629707d40b Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 24 May 2018 16:43:16 +0200 Subject: [PATCH 3/3] Remove constraint on rails --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 18b6ed1c4..987c75ec5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.2.0' +gem 'rails' # Use SCSS for stylesheets gem 'sass-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 217d3ae39..e7116b9f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -835,7 +835,7 @@ DEPENDENCIES pry-byebug rack-handlers rack-mini-profiler - rails (~> 5.2.0) + rails rails-controller-testing rbnacl-libsodium rest-client