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
7ef086e7
Commit
7ef086e7
authored
Mar 16, 2020
by
Natalia Tepluhina
Committed by
Mark Florian
Mar 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed SSH warning style
parent
521663ea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
12 deletions
+21
-12
app/views/shared/_no_ssh.html.haml
app/views/shared/_no_ssh.html.haml
+9
-8
changelogs/unreleased/creator-pairing-fix-alert.yml
changelogs/unreleased/creator-pairing-fix-alert.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+7
-4
No files found.
app/views/shared/_no_ssh.html.haml
View file @
7ef086e7
-
if
show_no_ssh_key_message?
-
if
show_no_ssh_key_message?
.no-ssh-key-message.alert.alert-warning
%div
{
class:
'no-ssh-key-message gl-alert gl-alert-warning'
,
role:
'alert'
}
-
add_ssh_key_link
=
link_to
s_
(
'MissingSSHKeyWarningLink|add an SSH key'
),
profile_keys_path
,
class:
'alert-link'
=
sprite_icon
(
'warning'
,
size:
16
,
css_class:
'gl-icon s16 gl-alert-icon gl-alert-icon-no-title'
)
-
ssh_message
=
_
(
"You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile"
)
%
{
add_ssh_key_link:
add_ssh_key_link
}
%button
{
class:
'gl-alert-dismiss hide-no-ssh-message'
,
type:
'button'
,
'aria-label'
:
'Dismiss'
}
=
ssh_message
.
html_safe
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'gl-icon s16'
)
.alert-link-group
.gl-alert-body
=
link_to
_
(
"Don't show again"
),
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
,
class:
'alert-link'
=
s_
(
"MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
).
html_safe
|
.gl-alert-actions
=
link_to
_
(
'Remind later'
),
'#'
,
class:
'hide-no-ssh-message alert-link'
=
link_to
s_
(
'MissingSSHKeyWarningLink|Add SSH key'
),
profile_keys_path
,
class:
"btn gl-alert-action btn-warning btn-md new-gl-button"
=
link_to
s_
(
"MissingSSHKeyWarningLink|Don't show again"
),
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
,
role:
'button'
,
class:
'btn gl-alert-action btn-md btn-warning btn-secondary new-gl-button'
changelogs/unreleased/creator-pairing-fix-alert.yml
0 → 100644
View file @
7ef086e7
---
title
:
Fixed SSH warning style
merge_request
:
26992
author
:
type
:
other
locale/gitlab.pot
View file @
7ef086e7
...
@@ -12792,7 +12792,13 @@ msgstr ""
...
@@ -12792,7 +12792,13 @@ msgstr ""
msgid "Missing commit signatures endpoint!"
msgid "Missing commit signatures endpoint!"
msgstr ""
msgstr ""
msgid "MissingSSHKeyWarningLink|add an SSH key"
msgid "MissingSSHKeyWarningLink|Add SSH key"
msgstr ""
msgid "MissingSSHKeyWarningLink|Don't show again"
msgstr ""
msgid "MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
msgstr ""
msgstr ""
msgid "Modal|Cancel"
msgid "Modal|Cancel"
...
@@ -23081,9 +23087,6 @@ msgstr ""
...
@@ -23081,9 +23087,6 @@ msgstr ""
msgid "You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account"
msgid "You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account"
msgstr ""
msgstr ""
msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile"
msgstr ""
msgid "You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
msgid "You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
msgstr ""
msgstr ""
...
...
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