BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1d72952d
Commit
1d72952d
authored
Oct 18, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '39201-improve-google-image' into 'master'
Replace google login image Closes #39201 See merge request gitlab-org/gitlab-ce!14919
parents
11dfe048
5df66e6b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
signin_with_google.png
app/assets/images/auth_buttons/signin_with_google.png
+0
-0
login.html.haml
app/views/projects/clusters/login.html.haml
+1
-1
No files found.
app/assets/images/auth_buttons/signin_with_google.png
View replaced file @
11dfe048
View file @
1d72952d
3.89 KB
|
W:
|
H:
7.81 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/views/projects/clusters/login.html.haml
View file @
1d72952d
...
...
@@ -10,7 +10,7 @@
.col-sm-8.col-sm-offset-4.signin-with-google
-
if
@authorize_url
=
link_to
@authorize_url
do
=
image_tag
(
'auth_buttons/signin_with_google.png'
)
=
image_tag
(
'auth_buttons/signin_with_google.png'
,
width:
'191px'
)
-
else
-
link
=
link_to
(
s_
(
'ClusterIntegration|properly configured'
),
help_page_path
(
"integration/google"
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service.'
).
html_safe
%
{
link_to_documentation:
link
}
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