diff --git a/debian/patches/0670-allow-doorkeepr-4_3.patch b/debian/patches/0670-allow-doorkeepr-4_3.patch new file mode 100644 index 0000000000..e4449ab052 --- /dev/null +++ b/debian/patches/0670-allow-doorkeepr-4_3.patch @@ -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 diff --git a/debian/patches/series b/debian/patches/series index 0fc3826ae8..0daad9588e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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