diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-11 18:45:12 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-11 18:45:12 +0200 |
| commit | 946b4ceda37fdb475b4176f466ef32470e6aeb1e (patch) | |
| tree | 8ac05f1399cdc2ec6575729c591264bb93679234 /app/views/projects/merge_requests/widget | |
| parent | 8893ac4ba407fdbacd85fa1b94d393b150ba5874 (diff) | |
| download | gitlab-ce-946b4ceda37fdb475b4176f466ef32470e6aeb1e.tar.gz | |
Improve variables in mr widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/widget')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index a9d8e3084ce..bb794912f8f 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -15,7 +15,7 @@ = render 'projects/merge_requests/widget/open/conflicts' - elsif @merge_request.work_in_progress? = render 'projects/merge_requests/widget/open/wip' - - elsif !@allowed_to_merge + - elsif !@merge_request.can_be_merged_by?(current_user) = render 'projects/merge_requests/widget/open/not_allowed' - elsif @merge_request.can_be_merged? = render 'projects/merge_requests/widget/open/accept' diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index 9e0c8a9e06f..d1db5fec43a 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -1,4 +1,4 @@ -- if @allowed_to_merge +- if @merge_request.can_be_merged_by?(current_user) %h4 This merge request contains merge conflicts that must be resolved. You can try it manually on the diff --git a/app/views/projects/merge_requests/widget/open/_wip.html.haml b/app/views/projects/merge_requests/widget/open/_wip.html.haml index 30482bce750..4ce3ab31278 100644 --- a/app/views/projects/merge_requests/widget/open/_wip.html.haml +++ b/app/views/projects/merge_requests/widget/open/_wip.html.haml @@ -1,4 +1,4 @@ -- if @allowed_to_merge +- if @merge_request.can_be_merged_by?(current_user) %h4 This merge request cannot be accepted because it is marked as Work In Progress. |