diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:07:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:07:29 +0300 |
commit | 1da3754b25657f49afdcb0b942506d365b1ee89d (patch) | |
tree | 9f4bfa94fdd1762ef99e6a61bf180ac8cd7b5616 /app/helpers | |
parent | 25521def84a6987fe9d4265b560e930bfb32c195 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/groups_helper.rb | 3 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 601560cca92..9cba87ac444 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -32,8 +32,7 @@ module GroupsHelper end def can_disable_group_emails?(group) - Feature.enabled?(:emails_disabled, group, default_enabled: true) && - can?(current_user, :set_emails_disabled, group) && !group.parent&.emails_disabled? + can?(current_user, :set_emails_disabled, group) && !group.parent&.emails_disabled? end def group_issues_count(state:) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 177778a7278..4b00c11b27c 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -160,7 +160,7 @@ module ProjectsHelper def can_disable_emails?(project, current_user) return false if project.group&.emails_disabled? - can?(current_user, :set_emails_disabled, project) && Feature.enabled?(:emails_disabled, project, default_enabled: true) + can?(current_user, :set_emails_disabled, project) end def last_push_event @@ -354,6 +354,14 @@ module ProjectsHelper @project.metrics_setting_external_dashboard_url end + def grafana_integration_url + @project.grafana_integration&.grafana_url + end + + def grafana_integration_token + @project.grafana_integration&.token + end + private def get_project_nav_tabs(project, current_user) |