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
3e87f537
Commit
3e87f537
authored
Jun 13, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spelling, specs and codestyle in Geo flash notice.
parent
3bef58b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
app/controllers/admin/application_controller.rb
app/controllers/admin/application_controller.rb
+1
-1
app/controllers/oauth/geo_auth_controller.rb
app/controllers/oauth/geo_auth_controller.rb
+4
-2
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
No files found.
app/controllers/admin/application_controller.rb
View file @
3e87f537
...
...
@@ -14,6 +14,6 @@ class Admin::ApplicationController < ApplicationController
def
display_geo_information
return
unless
Gitlab
::
Geo
.
secondary?
primary_node
=
link_to
(
'primary node'
,
Gitlab
::
Geo
.
primary_node
.
url
)
flash
.
now
[
:notice
]
=
"You are
in a Geo secondary node (read-only). To make any change
you must visit the
#{
primary_node
}
."
.
html_safe
flash
.
now
[
:notice
]
=
"You are
on a secondary (read-only) Geo node. If you want to make any changes,
you must visit the
#{
primary_node
}
."
.
html_safe
end
end
app/controllers/oauth/geo_auth_controller.rb
View file @
3e87f537
...
...
@@ -46,8 +46,10 @@ class Oauth::GeoAuthController < ActionController::Base
private
def
after_sign_in_with_gitlab
(
token
,
return_to
)
primary_node
=
link_to
(
'primary node'
,
Gitlab
::
Geo
.
primary_node
.
url
)
flash
[
:notice
]
=
"You are in a Geo secondary node (read-only). To make any change you must visit the
#{
primary_node
}
."
.
html_safe
if
Gitlab
::
Geo
.
primary_node
primary_node
=
link_to
(
'primary node'
,
Gitlab
::
Geo
.
primary_node
.
url
)
flash
.
now
[
:notice
]
=
"You are on a secondary (read-only) Geo node. If you want to make any changes, you must visit the
#{
primary_node
}
."
.
html_safe
end
session
[
:access_token
]
=
token
redirect_to
(
return_to
||
root_path
)
...
...
app/views/layouts/header/_default.html.haml
View file @
3e87f537
...
...
@@ -33,7 +33,7 @@
-
if
Gitlab
::
Geo
.
secondary?
%li
=
link_to
Gitlab
::
Geo
.
primary_node
.
url
,
title:
'Go to primary node'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'globe fw'
)
=
icon
(
'globe fw'
)
-
if
current_user
.
can_create_project?
%li
=
link_to
new_project_path
,
title:
'New project'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
...
...
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