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
b983e9ef
Commit
b983e9ef
authored
Nov 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ability to hide no ssh key message
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
986697a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
6 deletions
+23
-6
app/assets/javascripts/project.js.coffee
app/assets/javascripts/project.js.coffee
+5
-0
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+12
-3
app/views/shared/_no_ssh.html.haml
app/views/shared/_no_ssh.html.haml
+6
-3
No files found.
app/assets/javascripts/project.js.coffee
View file @
b983e9ef
...
@@ -40,3 +40,8 @@ $ ->
...
@@ -40,3 +40,8 @@ $ ->
# Ref switcher
# Ref switcher
$
(
'.project-refs-select'
).
on
'change'
,
->
$
(
'.project-refs-select'
).
on
'change'
,
->
$
(
@
).
parents
(
'form'
).
submit
()
$
(
@
).
parents
(
'form'
).
submit
()
$
(
'.hide-no-ssh-message'
).
on
'click'
,
(
e
)
->
$
.
cookie
(
'hide_no_ssh_message'
,
'false'
)
$
(
@
).
parents
(
'.no-ssh-key-message'
).
hide
()
e
.
preventDefault
()
app/assets/stylesheets/common.scss
View file @
b983e9ef
...
@@ -220,7 +220,6 @@ li.note {
...
@@ -220,7 +220,6 @@ li.note {
.error-message
{
.error-message
{
padding
:
10px
;
padding
:
10px
;
background
:
#C67
;
background
:
#C67
;
padding-left
:
20px
;
margin
:
0
;
margin
:
0
;
color
:
#FFF
;
color
:
#FFF
;
...
@@ -228,8 +227,18 @@ li.note {
...
@@ -228,8 +227,18 @@ li.note {
color
:
#fff
;
color
:
#fff
;
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
&
.centered
{
}
text-align
:
center
;
.no-ssh-key-message
{
padding
:
10px
0
;
background
:
#C67
;
margin
:
0
;
color
:
#FFF
;
text-align
:
center
;
a
{
color
:
#fff
;
text-decoration
:
underline
;
}
}
}
}
...
...
app/views/shared/_no_ssh.html.haml
View file @
b983e9ef
-
if
current_user
.
require_ssh_key?
&&
alert
.
blank?
&&
notice
.
blank?
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
%p
.error-message.centered
.no-ssh-key-message
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
}
to your profile
.container
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
}
to your profile
=
link_to
'#'
,
class:
'pull-right hide-no-ssh-message'
do
%i
.icon-remove
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