summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorPeter Leitzen <pleitzen@gitlab.com>2019-01-10 18:50:14 +0100
committerPeter Leitzen <pleitzen@gitlab.com>2019-01-15 21:33:40 +0100
commit77eff52afa379d653c47ecc64e75779a330be5e1 (patch)
tree34a35116cf6d491e0c90e0e4e191ebfe3edff434 /app/views
parent75b1837da79b5244a8da6bde1e391343fef59431 (diff)
downloadgitlab-ce-77eff52afa379d653c47ecc64e75779a330be5e1.tar.gz
Remove `error_tracking` feature flag
We introduced the feature flag `error_tracking` to test the Sentry MVC safely. After the successful test, we remove it again.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml2
-rw-r--r--app/views/projects/settings/operations/_error_tracking.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index d62cbc1684b..f2f4cd66f7c 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -227,7 +227,7 @@
%span
= _('Environments')
- - if project_nav_tab?(:error_tracking) && Feature.enabled?(:error_tracking, @project)
+ - if project_nav_tab?(:error_tracking)
= nav_link(controller: :error_tracking) do
= link_to project_error_tracking_index_path(@project), title: _('Error Tracking'), class: 'shortcuts-tracking qa-operations-tracking-link' do
%span
diff --git a/app/views/projects/settings/operations/_error_tracking.html.haml b/app/views/projects/settings/operations/_error_tracking.html.haml
index 871b60f05ba..4911e8d3770 100644
--- a/app/views/projects/settings/operations/_error_tracking.html.haml
+++ b/app/views/projects/settings/operations/_error_tracking.html.haml
@@ -1,4 +1,4 @@
-- return unless Feature.enabled?(:error_tracking, @project) && can?(current_user, :read_environment, @project)
+- return unless can?(current_user, :read_environment, @project)
- setting = error_tracking_setting