diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-10-26 15:47:21 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-10-26 15:48:16 +0100 |
| commit | 9c34090db84fc28bf6c40da700095f025f1887ea (patch) | |
| tree | 960afb18131d57f7120c0d584915f0c2c29902bb /Gemfile | |
| parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
| parent | 3678b10823a691256ad63c1c4df8dc659dfc3bc0 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 1cc838529..a271a36db 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ group :test do end group :development do - gem 'active_record_query_trace', '~> 1.7' + gem 'active_record_query_trace', '~> 1.8' gem 'annotate', '~> 3.1' gem 'better_errors', '~> 2.8' gem 'binding_of_caller', '~> 0.7' |