diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-03-11 16:08:15 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-11 16:08:15 +0100 |
commit | 1b6a21e6bc7ec9c0d5bb3daf2646d003ba90404c (patch) | |
tree | 656d328e630e1a4fa11e9853203f4dba8e29cb71 /Gemfile | |
parent | 318efa49de8d0b9615427c99ab07c591230dfd80 (diff) | |
parent | f2ca6c7a172deb9309c793adb87cdc4b46974a44 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/validators/status_length_validator.rb`: Conflict due to glitch-soc's configurable maximum toot chars. Ported upstream changes.
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile index b4d93a634..b50a957cc 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ group :development, :test do gem 'i18n-tasks', '~> 0.9', require: false gem 'pry-byebug', '~> 3.9' gem 'pry-rails', '~> 0.3' - gem 'rspec-rails', '~> 4.0' + gem 'rspec-rails', '~> 4.1' end group :production, :test do @@ -127,7 +127,7 @@ group :test do gem 'rspec-sidekiq', '~> 3.1' gem 'simplecov', '~> 0.21', require: false gem 'webmock', '~> 3.12' - gem 'parallel_tests', '~> 3.4' + gem 'parallel_tests', '~> 3.5' gem 'rspec_junit_formatter', '~> 0.4' end @@ -145,7 +145,7 @@ group :development do gem 'brakeman', '~> 4.10', require: false gem 'bundler-audit', '~> 0.7', require: false - gem 'capistrano', '~> 3.15' + gem 'capistrano', '~> 3.16' gem 'capistrano-rails', '~> 1.6' gem 'capistrano-rbenv', '~> 2.2' gem 'capistrano-yarn', '~> 2.0' |