diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-07 15:49:48 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-07 15:49:48 +0300 |
| commit | 8c727feea6e6f035cc11363eec2538aa7004ade2 (patch) | |
| tree | d4f6a7b49cef2bfe4aaeb1285cefe30255fff4a1 /app/views/projects/merge_requests | |
| parent | f59032e73a7d068f07f3f29ad17e6c51d9fe0778 (diff) | |
| parent | 4491a3d12b414a52f32175e328df8dc48987d0fd (diff) | |
Merge branch 'small-fixes' into 'master'
Small fixes
Improve application stability over unexpected cases
See merge request !1310
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index f909948995c..a4f2a890969 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -19,8 +19,10 @@ - if @merge_request.merged? %h4 - Merged by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)} - #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} + Merged + - if @merge_request.merge_event + by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)} + #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} = render "projects/merge_requests/show/remove_source_branch" - if @merge_request.locked? @@ -46,4 +48,3 @@ Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} = succeed '.' do != gfm(issues_sentence(@closes_issues)) - |