diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 1753513e5..f151a0baf --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ end group :test do gem 'minitest-reporters', '>= 0.5.0' - gem 'mocha', '~> 2.0' + gem 'mocha', '~> 2.6' gem 'simplecov', require: false gem 'webmock' gem 'rails-controller-testing' # bring back compatibility with rails 4 assigns in controller tests. diff --git a/Gemfile.lock b/Gemfile.lock index 8d3a2be93..6cef924cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM railties (>= 7.1) stimulus-rails turbo-rails - mocha (2.5.0) + mocha (2.6.0) ruby2_keywords (>= 0.0.5) msgpack (1.7.3) multi_xml (0.7.1) @@ -573,7 +573,7 @@ DEPENDENCIES memory_profiler minitest-reporters (>= 0.5.0) mission_control-jobs - mocha (~> 2.0) + mocha (~> 2.6) mysql2 omniauth omniauth-google-oauth2