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/open/_conflicts.html.haml | |
| 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/open/_conflicts.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |