diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 18:10:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 18:10:34 +0300 |
commit | 04a42f5e032537fc95c5158379748a7ff44385d5 (patch) | |
tree | 332ade9cc1fafbfd8f6cc7e84fdf37bf8b1f3fdc /Gemfile.lock | |
parent | f2c27c6f97cf138acaed79b90be7a5be520746fc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bcc334054f1..81faa6278e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,8 +63,8 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) + acts-as-taggable-on (7.0.0) + activerecord (>= 5.0, < 6.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -1270,7 +1270,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) - acts-as-taggable-on (~> 6.0) + acts-as-taggable-on (~> 7.0) addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.2) |