Allow doorkeeper 4.4
This commit is contained in:
parent
503de87f72
commit
0b1ca0fcb7
2 changed files with 21 additions and 0 deletions
20
debian/patches/0670-allow-doorkeepr-4_3.patch
vendored
Normal file
20
debian/patches/0670-allow-doorkeepr-4_3.patch
vendored
Normal file
|
@ -0,0 +1,20 @@
|
|||
Bug, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22966
|
||||
|
||||
--- a/config/initializers/doorkeeper.rb
|
||||
+++ b/config/initializers/doorkeeper.rb
|
||||
@@ -107,15 +107,6 @@
|
||||
base_controller '::Gitlab::BaseDoorkeeperController'
|
||||
end
|
||||
|
||||
-# Monkey patch to avoid creating new applications if the scope of the
|
||||
-# app created does not match the complete list of scopes of the configured app.
|
||||
-# It also prevents the OAuth authorize application window to appear every time.
|
||||
-
|
||||
-# Remove after we upgrade the doorkeeper gem from version 4.3.2
|
||||
-if Doorkeeper.gem_version > Gem::Version.new('4.3.2')
|
||||
- raise "Doorkeeper was upgraded, please remove the monkey patch in #{__FILE__}"
|
||||
-end
|
||||
-
|
||||
module Doorkeeper
|
||||
module AccessTokenMixin
|
||||
module ClassMethods
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -18,3 +18,4 @@
|
|||
0640-relax-ruby-version.patch
|
||||
0650-fix-8-to-10-migration.patch
|
||||
0660-fix-gitlab-yml-path.patch
|
||||
0670-allow-doorkeepr-4_3.patch
|
||||
|
|
Loading…
Reference in a new issue