Commit 2f62d2af authored by Phil Hughes's avatar Phil Hughes

Merge branch 'hide-mr-counts-in-project-list-where-mrs-disabled' into 'master'

Hide merge request count and link in project list where merge requests are disabled

See merge request gitlab-org/gitlab!56432
parents 69401726 761b2ec7
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
- use_creator_avatar = false unless local_assigns[:use_creator_avatar] == true - use_creator_avatar = false unless local_assigns[:use_creator_avatar] == true
- stars = true unless local_assigns[:stars] == false - stars = true unless local_assigns[:stars] == false
- forks = true unless local_assigns[:forks] == false - forks = true unless local_assigns[:forks] == false
- merge_requests = true unless local_assigns[:merge_requests] == false
- pipeline_status = true unless local_assigns[:pipeline_status] == false - pipeline_status = true unless local_assigns[:pipeline_status] == false
- skip_namespace = false unless local_assigns[:skip_namespace] == true - skip_namespace = false unless local_assigns[:skip_namespace] == true
- user = local_assigns[:user] - user = local_assigns[:user]
...@@ -39,8 +38,9 @@ ...@@ -39,8 +38,9 @@
- css_class = (i >= projects_limit) || project.pending_delete? ? 'hide' : nil - css_class = (i >= projects_limit) || project.pending_delete? ? 'hide' : nil
= render "shared/projects/project", project: project, skip_namespace: skip_namespace, = render "shared/projects/project", project: project, skip_namespace: skip_namespace,
avatar: avatar, stars: stars, css_class: css_class, use_creator_avatar: use_creator_avatar, avatar: avatar, stars: stars, css_class: css_class, use_creator_avatar: use_creator_avatar,
forks: forks, show_last_commit_as_description: show_last_commit_as_description, user: user, merge_requests: merge_requests, forks: forks, show_last_commit_as_description: show_last_commit_as_description, user: user,
issues: project.issues_enabled?, pipeline_status: pipeline_status, compact_mode: compact_mode merge_requests: project.merge_requests_enabled?, issues: project.issues_enabled?,
pipeline_status: pipeline_status, compact_mode: compact_mode
= paginate_collection(projects, remote: remote) unless skip_pagination = paginate_collection(projects, remote: remote) unless skip_pagination
- else - else
- if @contributed_projects - if @contributed_projects
......
---
title: Hide MR count and link in project list where MRs are disabled
merge_request: !56432
author: Simon Stieger @sim0
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment