diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-18 20:17:29 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-18 20:17:29 -0500 |
| commit | fbb27a4244994103ed94c4921fc47902a767b860 (patch) | |
| tree | 7273a6d8bfb6e9f10c5d1b68c19e495fad7eded8 | |
| parent | 8b3d6793454b2a955c88d9dcd65a130133996646 (diff) | |
| download | gitlab-ce-fbb27a4244994103ed94c4921fc47902a767b860.tar.gz | |
Fix spacing issues, fix naming inconsistencies. Fix conflicts.
Used `issuable` instead
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index b715819e30a..b14033720b5 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -560,6 +560,6 @@ pre.light-well { } .cannot-be-merged, .cannot-be-merged:hover { - color: $error-exclamation-point; + color: #E62958; margin-top: 2px; -}
\ No newline at end of file +} diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 1eb14b51533..3092ff54242 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -10,8 +10,8 @@ .value - if issuable.assignee %strong= link_to_member(@project, issuable.assignee, size: 24) - - if issuable.instance_of?(MergeRequest) && !@merge_request.can_be_merged_by?(issuable.assignee) - %a.pull-right.cannot-be-merged{href:'#', data:{toggle:'tooltip'}, title:'Not allowed to merge'} + - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee) + %a.pull-right.cannot-be-merged{href: '#', data: {toggle: 'tooltip'}, title: 'Not allowed to merge'} = icon('exclamation-triangle') - else .light None |