summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-04 10:55:29 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-04 10:55:29 +0000
commit8c280b1c148e97263d3b8fa91b3bbf9b4c54fe5b (patch)
tree15d3091ebf0742b3447b9f57b1d5cc76065f179d /Gemfile
parent5042f008ede44a624517bbe0c84764d9cbda990c (diff)
parentf571aeb5ce38dce1a9e5f58d76360836d4a8f8a0 (diff)
downloadgitlab-ce-8c280b1c148e97263d3b8fa91b3bbf9b4c54fe5b.tar.gz
Merge branch 'cs-upgrade-acts-as-taggable-on' into 'master'
Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0. ## What does this MR do? Upgrades the acts-as-taggable-on gem from 3.5.0 to 4.0.0. Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08 ## Are there points in the code the reviewer needs to double check? That this works without the migrations, I don't believe the upgrade from 3.5.0 to 4.0.0 requires any migrations since [UPGRADING.md hasn't been updated since 3.5.0 was released](https://github.com/mbleigh/acts-as-taggable-on/blob/master/UPGRADING.md). It's kind of unclear, unfortunately. ## What are the relevant issue numbers? Fixes #22082. Working toward Rails 5: #14286. cc: @dzaporozhets See merge request !6660
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index d7de92bdcec..d54beedf67e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -130,7 +130,7 @@ gem 'state_machines-activerecord', '~> 0.4.0'
gem 'after_commit_queue', '~> 1.3.0'
# Issue tags
-gem 'acts-as-taggable-on', '~> 3.4'
+gem 'acts-as-taggable-on', '~> 4.0'
# Background jobs
gem 'sidekiq', '~> 4.2'