diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-19 17:35:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-19 17:35:29 +0000 |
| commit | 340df52bc7734ff76e75aae113313259e42680fb (patch) | |
| tree | a234c2ea2a73ead2b956139a23e36671111f78bd | |
| parent | c8d66514efcf946f847cb3120b271d8f0f0327f2 (diff) | |
| parent | f5562355f4580ea049d33991aa0eaf76f46b17f7 (diff) | |
| download | gitlab-ce-340df52bc7734ff76e75aae113313259e42680fb.tar.gz | |
Merge branch 'display-message-when-assignee-cannot-merge' into 'master'
adds exclamation point when assigned user cannot merge
Fixes: #4175
See merge request !2408
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 85ecdddda79..3ec48da9a41 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -26,6 +26,7 @@ $gl-vert-padding: 6px; $gl-padding-top:10px; $gl-avatar-size: 46px; $secondary-text: #7f8fa4; +$error-exclamation-point: #E62958; /* * Color schema diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 3a87b71078d..003a4c22f20 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -558,3 +558,9 @@ pre.light-well { width: 101%; } } + +.cannot-be-merged, +.cannot-be-merged:hover { + color: #E62958; + margin-top: 2px; +} diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 9f4a7098ea2..3092ff54242 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -10,6 +10,9 @@ .value - if issuable.assignee %strong= link_to_member(@project, issuable.assignee, size: 24) + - 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 |