diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-01 15:23:30 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-01 15:23:30 +0000 |
| commit | fd2a429f35f521c7ab3b2b868d0e7ad55b6cbbba (patch) | |
| tree | 6ab9ee6953734fffb8abe6c865626ad47e81c6fd /app/views | |
| parent | 8146ad819e626439ac16aa473f10112ddbcf01cd (diff) | |
| parent | cb6f8cdfc23a18daf33288c95ae8badec63f53ad (diff) | |
| download | gitlab-ce-fd2a429f35f521c7ab3b2b868d0e7ad55b6cbbba.tar.gz | |
Merge branch 'use-st-commits-where-possible' into 'master'
Replace references to MergeRequestDiff#commits with st_commits when we care only about the number of commits
See merge request !7668
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/show/_versions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/show/_versions.html.haml b/app/views/projects/merge_requests/show/_versions.html.haml index eab48b78cb3..5cc92595fe0 100644 --- a/app/views/projects/merge_requests/show/_versions.html.haml +++ b/app/views/projects/merge_requests/show/_versions.html.haml @@ -27,7 +27,7 @@ version #{version_index(merge_request_diff)} .monospace #{short_sha(merge_request_diff.head_commit_sha)} %small - #{number_with_delimiter(merge_request_diff.commits.count)} #{'commit'.pluralize(merge_request_diff.commits.count)}, + #{number_with_delimiter(merge_request_diff.commits_count)} #{'commit'.pluralize(merge_request_diff.commits_count)}, = time_ago_with_tooltip(merge_request_diff.created_at) - if @merge_request_diff.base_commit_sha diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index 20c93930abc..eee711dc5af 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -11,7 +11,7 @@ = render 'projects/merge_requests/widget/open/archived' - elsif @merge_request.branch_missing? = render 'projects/merge_requests/widget/open/missing_branch' - - elsif @merge_request.commits.blank? + - elsif @merge_request.has_no_commits? = render 'projects/merge_requests/widget/open/nothing' - elsif @merge_request.unchecked? = render 'projects/merge_requests/widget/open/check' |