From 3832718d895bf8268f3e3aac85948e2792769345 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 22 Jan 2020 18:08:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/doorkeeper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 6be5c00daaa..7e787c35982 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -118,8 +118,8 @@ end # 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') +# Remove after we upgrade the doorkeeper gem from version 4.x +if Doorkeeper.gem_version > Gem::Version.new('5.0.0') raise "Doorkeeper was upgraded, please remove the monkey patch in #{__FILE__}" end -- cgit v1.2.3