diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 22:23:22 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 22:23:22 +0300 |
| commit | 7a5e653fde62cfcd0e05be7954bbf14de0cb6d8c (patch) | |
| tree | f7307706ea732f779b2cf4884b95bfbc1251a172 /app/views/projects | |
| parent | 06cf647c9b1936f55553b88f71c04cb593dfa7ae (diff) | |
| parent | 35615bc33179a88c580cc28aca74c70754d21120 (diff) | |
Merge branch 'hide-empty-merge-request-diffs' into 'master'
Fix errors happening when source branch of merge request is removed and then restored
See merge request !7568
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index ac26aa569ba..20c93930abc 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -9,10 +9,10 @@ - if @project.archived? = render 'projects/merge_requests/widget/open/archived' - - elsif @merge_request.commits.blank? - = render 'projects/merge_requests/widget/open/nothing' - elsif @merge_request.branch_missing? = render 'projects/merge_requests/widget/open/missing_branch' + - elsif @merge_request.commits.blank? + = render 'projects/merge_requests/widget/open/nothing' - elsif @merge_request.unchecked? = render 'projects/merge_requests/widget/open/check' - elsif @merge_request.cannot_be_merged? && !resolved_conflicts |