Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-09 03:08:41 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-09 03:08:41 +0300
commitc02e2a5ef6b928da420e844b54fc6bbce16754c8 (patch)
tree1f738c4c0c7fc04a3235e8bad807972a740611f2 /app/helpers/projects_helper.rb
parentb0980f5557a8621fb08785b06be950ee46796c18 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r--app/helpers/projects_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 6e317a63e47..060c155401f 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -301,7 +301,6 @@ module ProjectsHelper
!disabled && !compact_mode
end
- # overridden in EE
def settings_operations_available?
can?(current_user, :read_environment, @project)
end
@@ -755,6 +754,7 @@ module ProjectsHelper
logs
product_analytics
metrics_dashboard
+ tracings
]
end