diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-23 10:22:37 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-23 10:22:37 +0000 |
| commit | e2203bb0198f7519988a8420e3347ec0721d2399 (patch) | |
| tree | 7a886cf321aa1ff9fd248b5a71d2c30ccb012ba0 | |
| parent | f59a63115e4dada039b9bc098a50fae2589f2ece (diff) | |
| parent | 01bbbe19f7aafa56053246bb6bfde3af56c118a8 (diff) | |
| download | gitlab-ce-e2203bb0198f7519988a8420e3347ec0721d2399.tar.gz | |
Merge branch '10443-ee-diff-commits-commit' into 'master'
Move EE differences for `app/views/projects/commits/_commit.html.haml`
See merge request gitlab-org/gitlab-ce!28548
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index e2d078855d9..771e1881e94 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -9,6 +9,9 @@ - commit_status = commit.present(current_user: current_user).status_for(ref) - link = commit_path(project, commit, merge_request: merge_request) + +- show_project_name = local_assigns.fetch(:show_project_name, false) + %li.commit.flex-row.js-toggle-container{ id: "commit-#{commit.short_id}" } .avatar-cell.d-none.d-sm-block @@ -32,6 +35,7 @@ - commit_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom') - commit_text = _('%{commit_author_link} authored %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } #{ commit_text.html_safe } + = render_if_exists 'projects/commits/project_namespace', show_project_name: show_project_name, project: project - if commit.description? %pre.commit-row-description.js-toggle-content.append-bottom-8 |