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-11-06 21:09:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-06 21:09:07 +0300
commitf3db01da507f86cfed412c7d337e3747744cc914 (patch)
tree3862e3ca223038c1390e2d19708ebeeecb040e00 /app/helpers/projects_helper.rb
parenta268b09416c8dc3da3af38933028fa26375b88e0 (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 9d1f685960f..a3919008109 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -302,7 +302,7 @@ module ProjectsHelper
end
def settings_operations_available?
- can?(current_user, :read_environment, @project)
+ !@project.archived? && can?(current_user, :admin_operations, @project)
end
def error_tracking_setting_project_json