diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 15:06:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 15:06:08 +0000 |
commit | d88843f370acfcbbd3e2b9d6d662d62132647d86 (patch) | |
tree | 9594bad83068245c57d592c9dabd47793b3a755b /Gemfile.lock | |
parent | d8c06be498acbfc2024c01b6b6b02d120dc499f2 (diff) | |
download | gitlab-ce-d88843f370acfcbbd3e2b9d6d662d62132647d86.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a53485e6220..7582eb28e49 100644 --- 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) - activerecord (~> 5.0) + acts-as-taggable-on (6.5.0) + activerecord (>= 5.0, < 6.1) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) |