Commit 3f7d2201 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-fix-geo-error-autoload-issues' into 'master'

Move Geo exceptions ee/lib/gitlab/geo.rb to fix autoload issues

Closes #4970

See merge request gitlab-org/gitlab-ee!4588
parents 9cc30060 12ea02d6
...@@ -2,6 +2,8 @@ module Gitlab ...@@ -2,6 +2,8 @@ module Gitlab
module Geo module Geo
OauthApplicationUndefinedError = Class.new(StandardError) OauthApplicationUndefinedError = Class.new(StandardError)
GeoNodeNotFoundError = Class.new(StandardError) GeoNodeNotFoundError = Class.new(StandardError)
InvalidDecryptionKeyError = Class.new(StandardError)
InvalidSignatureTimeError = Class.new(StandardError)
CACHE_KEYS = %i( CACHE_KEYS = %i(
geo_primary_node geo_primary_node
......
module Gitlab module Gitlab
module Geo module Geo
InvalidDecryptionKeyError = Class.new(StandardError)
InvalidSignatureTimeError = Class.new(StandardError)
class JwtRequestDecoder class JwtRequestDecoder
include LogHelpers include LogHelpers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment