Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cf0693b4
Commit
cf0693b4
authored
Apr 10, 2019
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Secondaries get their own URL from config
Not from `geo_nodes.url`.
parent
8e028ffa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/controllers/ee/sessions_controller.rb
ee/app/controllers/ee/sessions_controller.rb
+1
-1
ee/spec/controllers/ee/sessions_controller_spec.rb
ee/spec/controllers/ee/sessions_controller_spec.rb
+1
-1
No files found.
ee/app/controllers/ee/sessions_controller.rb
View file @
cf0693b4
...
...
@@ -14,7 +14,7 @@ module EE
return
super
if
signed_in?
if
::
Gitlab
::
Geo
.
secondary_with_primary?
redirect_to
oauth_geo_auth_url
(
host:
::
Gitlab
::
Geo
.
current_node
.
url
,
state:
geo_login_state
.
encode
)
redirect_to
oauth_geo_auth_url
(
host:
GeoNode
.
current_node_
url
,
state:
geo_login_state
.
encode
)
else
super
end
...
...
ee/spec/controllers/ee/sessions_controller_spec.rb
View file @
cf0693b4
...
...
@@ -27,7 +27,7 @@ describe SessionsController, :geo do
redirect_params
=
CGI
.
parse
(
redirect_uri
.
query
)
expect
(
response
).
to
have_gitlab_http_status
(
302
)
expect
(
response
).
to
redirect_to
%r(
\A
#{
primary_node
.
url
}
oauth/geo/auth)
expect
(
response
).
to
redirect_to
%r(
\A
#{
Gitlab
.
config
.
gitlab
.
url
}
/
oauth/geo/auth)
expect
(
redirect_params
[
'state'
].
first
).
to
end_with
(
':'
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment