Polishin & fixed tree switch
This commit is contained in:
parent
cb59aade4e
commit
eb7bbedb20
11 changed files with 82 additions and 50 deletions
|
@ -1,5 +1,5 @@
|
|||
- if current_user.require_ssh_key?
|
||||
.alert-message.warning
|
||||
.alert-message.block-message.error
|
||||
%p
|
||||
You wont be able to pull/push project code unless you
|
||||
= link_to new_key_path, :class => "vlink" do
|
||||
|
@ -32,7 +32,7 @@
|
|||
New Project »
|
||||
|
||||
|
||||
- unless @merge_requests.blank?
|
||||
- if @merge_requests.any?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
= link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
|
||||
|
@ -45,7 +45,7 @@
|
|||
.row
|
||||
.dashboard_block= render "dashboard/merge_requests_feed"
|
||||
|
||||
- unless @issues.blank?
|
||||
- if @issues.any?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
= link_to "Issues" , "#issues", :id => "issues"
|
||||
|
@ -57,7 +57,7 @@
|
|||
.row
|
||||
.dashboard_block= render "dashboard/issues_feed"
|
||||
|
||||
- unless @events.blank?
|
||||
- if @events.any?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
%span.ico.activities
|
||||
|
|
|
@ -3,4 +3,5 @@
|
|||
%small ( assigned to you )
|
||||
|
||||
%br
|
||||
.ui-box= render "dashboard/issues_feed"
|
||||
- if @issues.any?
|
||||
.ui-box= render "dashboard/issues_feed"
|
||||
|
|
|
@ -3,4 +3,5 @@
|
|||
%small ( authored or assigned to you )
|
||||
|
||||
%br
|
||||
.ui-box= render "dashboard/merge_requests_feed"
|
||||
- if @merge_requests.any?
|
||||
.ui-box= render "dashboard/merge_requests_feed"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue