diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
| commit | 0e74d4da592d6ac5e3c52b0f9c6b1906376aa707 (patch) | |
| tree | 66ae31bd3fd0228ebc6f92325cf43c7f02e4263d /Gemfile | |
| parent | 7a75bce1b43df290baf6842e2bb3d3eb0acd76d5 (diff) | |
| parent | 27f41768e8d66d97c8d705d764e534e52ea13af9 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 9e9a6b0d6..dc25538c0 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.8' -gem 'bootsnap', '~> 1.11.1', require: false +gem 'bootsnap', '~> 1.12.0', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.7' gem 'chewy', '~> 7.2' @@ -135,7 +135,7 @@ group :development do gem 'letter_opener_web', '~> 2.0' gem 'memory_profiler' gem 'rubocop', '~> 1.30', require: false - gem 'rubocop-rails', '~> 2.14', require: false + gem 'rubocop-rails', '~> 2.15', require: false gem 'brakeman', '~> 5.2', require: false gem 'bundler-audit', '~> 0.9', require: false |