diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 21:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 21:08:47 +0300 |
| commit | 3832718d895bf8268f3e3aac85948e2792769345 (patch) | |
| tree | 4a322399af568b6203e732ae2e2f3efc39b23a67 /config/initializers | |
| parent | 180cd023a11c0eb413ad0de124d9758ea25672bd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |