diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 06:09:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 06:09:06 +0000 |
| commit | cefe554b7ce2d0b52f9de855be832a47c2bc24ab (patch) | |
| tree | 74c1ad2f688afd2f806aaf94e73e0bcd128cea00 /app/views/shared | |
| parent | 5ee120f46740efac7b8a460d7a92e4da82f4fb0b (diff) | |
| download | gitlab-ce-cefe554b7ce2d0b52f9de855be832a47c2bc24ab.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 45e95685677..07a61b71b8e 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -12,9 +12,7 @@ - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description - cache_key = project_list_cache_key(project, pipeline_status: pipeline_status) - updated_tooltip = time_ago_with_tooltip(project.last_activity_date) -- show_pipeline_status_icon = pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project) - css_controls_class = compact_mode ? [] : ["flex-lg-row", "justify-content-lg-between"] -- css_controls_class << "with-pipeline-status" if show_pipeline_status_icon - avatar_container_class = project.creator && use_creator_avatar ? '' : 'rect-avatar' %li.project-row.d-flex{ class: css_class } @@ -62,11 +60,6 @@ .controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0.text-secondary{ class: css_controls_class.join(" ") } .icon-container.d-flex.align-items-center - - if show_pipeline_status_icon - - pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref) - %span.icon-wrapper.pipeline-status - = render 'ci/status/icon', status: project.last_pipeline.detailed_status(current_user), tooltip_placement: 'top', path: pipeline_path - = render_if_exists 'shared/projects/archived', project: project - if stars = link_to project_starrers_path(project), |