Download as
Browse Code »

Commit 0175e665893ca8f8fd660ff55841e95c02fcb987

Authored by Dmitriy Zaporozhets
1 parent 37cf2eb6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

hide no-ssh message if notice or alert present

Showing 3 changed files with 4 additions and 8 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @0175e66
@@ -49,12 +49,8 @@ table a code { @@ -49,12 +49,8 @@ table a code {
49 cursor: pointer; 49 cursor: pointer;
50 margin: 0; 50 margin: 0;
51 text-align: center; 51 text-align: center;
52 - border-radius: 0;  
53 color: #fff; 52 color: #fff;
54 -  
55 - span {  
56 - font-size: 14px;  
57 - } 53 + font-size: 14px;
58 54
59 .flash-notice { 55 .flash-notice {
60 background: #49C; 56 background: #49C;
app/views/layouts/_flash.html.haml
  Diff comments   View file @0175e66
1 .flash-container 1 .flash-container
2 - if alert 2 - if alert
3 .flash-alert 3 .flash-alert
4 - %span= alert 4 + = alert
5 5
6 - elsif notice 6 - elsif notice
7 .flash-notice 7 .flash-notice
8 - %span= notice 8 + = notice
app/views/shared/_no_ssh.html.haml
  Diff comments   View file @0175e66
1 -- if current_user.require_ssh_key? 1 +- if current_user.require_ssh_key? && alert.blank? && notice.blank?
2 %p.error-message.centered 2 %p.error-message.centered
3 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 3 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