Relax dependency on acts-as-taggable-on

This commit is contained in:
Pirate Praveen 2019-03-04 21:07:15 +05:30
parent dbf55cc3b7
commit dde79fbd00
3 changed files with 15 additions and 1 deletions

2
debian/control vendored
View file

@ -152,7 +152,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# State machine
ruby-state-machines-activerecord (>= 0.5.1~),
# Issue tags
ruby-acts-as-taggable-on (>= 5.0~),
ruby-acts-as-taggable-on (>= 6.0~),
# Background jobs
ruby-sidekiq (>= 5.2.1~),
ruby-sidekiq-cron (>= 0.6~),

View file

@ -0,0 +1,13 @@
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25740
--- a/Gemfile
+++ b/Gemfile
@@ -151,7 +151,7 @@
gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags
-gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
gem 'sidekiq', '~> 5.2', '>= 5.2.1'

View file

@ -10,6 +10,7 @@
0440-remove-puma.patch
0450-remove-bullet.patch
0470-relax-rails.patch
0480-relax-acts-as-taggable-on.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch