diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 18:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 18:08:04 +0300 |
| commit | c4c1fc5fe7c756fc6f8f79eb1624b1bbe4fe2d69 (patch) | |
| tree | 8c95e39fc4956cdd9178c46ea85cbeeeac3bc360 /app/helpers/projects_helper.rb | |
| parent | 927df95cc4453bdacbc59960df32008b02c4e28a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index fc587ebb94c..d743ea6aeea 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -588,7 +588,8 @@ module ProjectsHelper containerRegistryEnabled: !!project.container_registry_enabled, lfsEnabled: !!project.lfs_enabled, emailsDisabled: project.emails_disabled?, - metricsDashboardAccessLevel: feature.metrics_dashboard_access_level + metricsDashboardAccessLevel: feature.metrics_dashboard_access_level, + showDefaultAwardEmojis: project.show_default_award_emojis? } end |