diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-08 05:03:00 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-08 05:03:00 +0300 |
| commit | d0bb16fcdc38c6491ff48daf139ae41e55b355ca (patch) | |
| tree | 66679c94edf0e98eda497305fadc49d404d89548 /app/helpers | |
| parent | f2fee7bc6b363774fb1c8e1b154b529db2dff02c (diff) | |
| parent | 710f2ec50c49d1e773acc20058ed584f1402de33 (diff) | |
Merge branch 'master' into 11-7-stable
Diffstat (limited to 'app/helpers')
| -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 af7a262e32c..e67c327f7f8 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -285,7 +285,7 @@ module ProjectsHelper # overridden in EE def settings_operations_available? - false + Feature.enabled?(:error_tracking, @project) && can?(current_user, :read_environment, @project) end private @@ -549,6 +549,7 @@ module ProjectsHelper services#edit repository#show ci_cd#show + operations#show badges#index pages#show ] |