Merge branch '33408-upgrade-acts-as-taggable' into 'master'

Upgrade acts-as-taggable-on to 6.5 See merge request gitlab-org/gitlab!19845

Merge branch '33408-upgrade-acts-as-taggable' into 'master'
Upgrade acts-as-taggable-on to 6.5 See merge request gitlab-org/gitlab!19845
561159e3 · Douglas Barbosa Alexandre · 5cc79c8f · f80c1242 · 561159e3
Commit 561159e3 authored Nov 14, 2019 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,8 +50,8 @@ GEM
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    acts-as-taggable-on (6.0.0)
+    acts-as-taggable-on (6.5.0)
-      activerecord (~> 5.0)
+      activerecord (>= 5.0, < 6.1)
    adamantium (0.2.0)
      ice_nine (~> 0.11.0)
      memoizable (~> 0.4.0)