diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/helpers/projects_helper.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r-- | app/helpers/projects_helper.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 8a75f545a32..21c7a54670c 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -420,6 +420,14 @@ module ProjectsHelper project.path_with_namespace end + def able_to_see_issues?(project, user) + project.issues_enabled? && can?(user, :read_issue, project) + end + + def able_to_see_merge_requests?(project, user) + project.merge_requests_enabled? && can?(user, :read_merge_request, project) + end + def fork_button_disabled_tooltip(project) return unless current_user @@ -627,7 +635,9 @@ module ProjectsHelper end def can_show_last_commit_in_list?(project) - can?(current_user, :read_cross_project) && project.commit + can?(current_user, :read_cross_project) && + can?(current_user, :read_commit_status, project) && + project.commit end def pages_https_only_disabled? @@ -640,14 +650,6 @@ module ProjectsHelper "You must enable HTTPS for all your domains first" end - def pages_https_only_label_class - if pages_https_only_disabled? - "list-label disabled" - else - "list-label" - end - end - def filter_starrer_path(options = {}) options = params.slice(:sort).merge(options).permit! "#{request.path}?#{options.to_param}" |