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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
f1c39763
Commit
f1c39763
authored
Dec 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UI for no-ssh-key message
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
038161f4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
38 deletions
+10
-38
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-20
app/views/layouts/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+0
-3
app/views/layouts/projects.html.haml
app/views/layouts/projects.html.haml
+0
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+3
-0
app/views/shared/_no_ssh.html.haml
app/views/shared/_no_ssh.html.haml
+7
-13
No files found.
app/assets/stylesheets/generic/common.scss
View file @
f1c39763
...
@@ -207,26 +207,6 @@ li.note {
...
@@ -207,26 +207,6 @@ li.note {
}
}
}
}
.no-ssh-key-message
{
padding
:
10px
0
;
background
:
#C67
;
margin
:
0
;
color
:
#FFF
;
margin-top
:
-1px
;
text-align
:
center
;
a
{
color
:
#fff
;
text-decoration
:
underline
;
}
.links-xs
{
text-align
:
center
;
font-size
:
16px
;
padding
:
5px
;
}
}
.warning_message
{
.warning_message
{
border-left
:
4px
solid
#ed9
;
border-left
:
4px
solid
#ed9
;
color
:
#b90
;
color
:
#b90
;
...
...
app/views/layouts/project_settings.html.haml
View file @
f1c39763
...
@@ -5,8 +5,5 @@
...
@@ -5,8 +5,5 @@
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
-
@project_settings_nav
=
true
-
@project_settings_nav
=
true
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
app/views/layouts/projects.html.haml
View file @
f1c39763
...
@@ -5,6 +5,4 @@
...
@@ -5,6 +5,4 @@
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
app/views/projects/show.html.haml
View file @
f1c39763
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
"home_panel"
=
render
"home_panel"
-
readme
=
@repository
.
readme
-
readme
=
@repository
.
readme
...
...
app/views/shared/_no_ssh.html.haml
View file @
f1c39763
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
&&
!
current_user
.
hide_no_ssh_key
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
&&
!
current_user
.
hide_no_ssh_key
.no-ssh-key-message
.no-ssh-key-message.alert.alert-warning.hidden-xs
.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
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
.pull-right.hidden-xs
.pull-right
=
link_to
"Don't show again"
,
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
,
class:
'hide-no-ssh-message'
,
remote:
true
=
link_to
"Don't show again"
,
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
,
class:
'hide-no-ssh-message'
,
remote:
true
|
|
=
link_to
'Remind later'
,
'#'
,
class:
'hide-no-ssh-message'
=
link_to
'Remind later'
,
'#'
,
class:
'hide-no-ssh-message'
.links-xs.visible-xs
=
link_to
"Add key"
,
new_profile_key_path
|
=
link_to
"Don't show again"
,
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
,
class:
'hide-no-ssh-message'
,
remote:
true
|
=
link_to
'Later'
,
'#'
,
class:
'hide-no-ssh-message'
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