Relax dependency on acts-as-taggable-on
This commit is contained in:
parent
dbf55cc3b7
commit
dde79fbd00
3 changed files with 15 additions and 1 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -152,7 +152,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
# State machine
|
# State machine
|
||||||
ruby-state-machines-activerecord (>= 0.5.1~),
|
ruby-state-machines-activerecord (>= 0.5.1~),
|
||||||
# Issue tags
|
# Issue tags
|
||||||
ruby-acts-as-taggable-on (>= 5.0~),
|
ruby-acts-as-taggable-on (>= 6.0~),
|
||||||
# Background jobs
|
# Background jobs
|
||||||
ruby-sidekiq (>= 5.2.1~),
|
ruby-sidekiq (>= 5.2.1~),
|
||||||
ruby-sidekiq-cron (>= 0.6~),
|
ruby-sidekiq-cron (>= 0.6~),
|
||||||
|
|
13
debian/patches/0480-relax-acts-as-taggable-on.patch
vendored
Normal file
13
debian/patches/0480-relax-acts-as-taggable-on.patch
vendored
Normal 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'
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -10,6 +10,7 @@
|
||||||
0440-remove-puma.patch
|
0440-remove-puma.patch
|
||||||
0450-remove-bullet.patch
|
0450-remove-bullet.patch
|
||||||
0470-relax-rails.patch
|
0470-relax-rails.patch
|
||||||
|
0480-relax-acts-as-taggable-on.patch
|
||||||
0500-set-webpack-root.patch
|
0500-set-webpack-root.patch
|
||||||
0510-remove-dev-dependencies.patch
|
0510-remove-dev-dependencies.patch
|
||||||
0520-add-system-lib-path-for-webpack.patch
|
0520-add-system-lib-path-for-webpack.patch
|
||||||
|
|
Loading…
Reference in a new issue