diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-22 15:16:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 15:16:21 +0200 |
| commit | 2024aef0f9b52297d814811f5825678a563f78ff (patch) | |
| tree | 5014b9fa72ae4704d61ae7ffc8e992f0b67b6a25 /Gemfile | |
| parent | 03952c7d4980a008f6711d7f14b8808229d73524 (diff) | |
| parent | 8027d921ab174b35bcf08bf96b69676a4515435f (diff) | |
Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream
Merge 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 93b87c159..77858e9e2 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem 'sidekiq', '~> 6.2' gem 'sidekiq-scheduler', '~> 3.0' gem 'sidekiq-unique-jobs', '~> 7.0' gem 'sidekiq-bulk', '~>0.2.0' -gem 'simple-navigation', '~> 4.1' +gem 'simple-navigation', '~> 4.3' gem 'simple_form', '~> 5.1' gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' gem 'stoplight', '~> 2.2.1' @@ -117,12 +117,12 @@ end group :test do gem 'capybara', '~> 3.35' gem 'climate_control', '~> 0.2' - gem 'faker', '~> 2.17' + gem 'faker', '~> 2.18' gem 'microformats', '~> 4.2' gem 'rails-controller-testing', '~> 1.0' gem 'rspec-sidekiq', '~> 3.1' gem 'simplecov', '~> 0.21', require: false - gem 'webmock', '~> 3.12' + gem 'webmock', '~> 3.13' gem 'parallel_tests', '~> 3.7' gem 'rspec_junit_formatter', '~> 0.4' end |