Skip to content

Commit d4d4eba

Browse files
committed
Merge branch '56213-remove-error_tracking-feature-flag' into 'master'
Resolve "Remove `error_tracking` feature flag" Closes #56213 See merge request gitlab-org/gitlab-ce!24306
2 parents 49efb57 + 77eff52 commit d4d4eba

File tree

9 files changed

+7
-75
lines changed

9 files changed

+7
-75
lines changed

app/assets/javascripts/error_tracking/index.js

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import store from './store';
44
import ErrorTrackingList from './components/error_tracking_list.vue';
55

66
export default () => {
7-
if (!gon.features.errorTracking) {
8-
return;
9-
}
10-
117
// eslint-disable-next-line no-new
128
new Vue({
139
el: '#js-error_tracking',

app/controllers/projects/error_tracking_controller.rb

-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# frozen_string_literal: true
22

33
class Projects::ErrorTrackingController < Projects::ApplicationController
4-
before_action :check_feature_flag!
54
before_action :authorize_read_sentry_issue!
6-
before_action :push_feature_flag_to_frontend
75

86
POLLING_INTERVAL = 10_000
97

@@ -43,12 +41,4 @@ def serialize_errors(errors)
4341
.new(project: project, user: current_user)
4442
.represent(errors)
4543
end
46-
47-
def check_feature_flag!
48-
render_404 unless Feature.enabled?(:error_tracking, project)
49-
end
50-
51-
def push_feature_flag_to_frontend
52-
push_frontend_feature_flag(:error_tracking, current_user)
53-
end
5444
end

app/helpers/projects_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def show_issue_count?(disabled: false, compact_mode: false)
285285

286286
# overridden in EE
287287
def settings_operations_available?
288-
Feature.enabled?(:error_tracking, @project) && can?(current_user, :read_environment, @project)
288+
can?(current_user, :read_environment, @project)
289289
end
290290

291291
private

app/views/layouts/nav/sidebar/_project.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
%span
228228
= _('Environments')
229229
230-
- if project_nav_tab?(:error_tracking) && Feature.enabled?(:error_tracking, @project)
230+
- if project_nav_tab?(:error_tracking)
231231
= nav_link(controller: :error_tracking) do
232232
= link_to project_error_tracking_index_path(@project), title: _('Error Tracking'), class: 'shortcuts-tracking qa-operations-tracking-link' do
233233
%span

app/views/projects/settings/operations/_error_tracking.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- return unless Feature.enabled?(:error_tracking, @project) && can?(current_user, :read_environment, @project)
1+
- return unless can?(current_user, :read_environment, @project)
22

33
- setting = error_tracking_setting
44

spec/controllers/projects/error_tracking_controller_spec.rb

-12
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@
2020
expect(response).to render_template(:index)
2121
end
2222

23-
context 'with feature flag disabled' do
24-
before do
25-
stub_feature_flags(error_tracking: false)
26-
end
27-
28-
it 'returns 404' do
29-
get :index, params: project_params
30-
31-
expect(response).to have_gitlab_http_status(:not_found)
32-
end
33-
end
34-
3523
context 'with insufficient permissions' do
3624
before do
3725
project.add_guest(user)

spec/controllers/projects/settings/operations_controller_spec.rb

-24
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@
4141
end
4242
end
4343

44-
context 'with feature flag disabled' do
45-
before do
46-
stub_feature_flags(error_tracking: false)
47-
end
48-
49-
it 'renders 404' do
50-
get :show, params: project_params(project)
51-
52-
expect(response).to have_gitlab_http_status(:not_found)
53-
end
54-
end
55-
5644
context 'with insufficient permissions' do
5745
before do
5846
project.add_reporter(user)
@@ -121,18 +109,6 @@
121109
end
122110
end
123111

124-
context 'with feature flag disabled' do
125-
before do
126-
stub_feature_flags(error_tracking: false)
127-
end
128-
129-
it 'renders 404' do
130-
patch :update, params: project_params(project)
131-
132-
expect(response).to have_gitlab_http_status(:not_found)
133-
end
134-
end
135-
136112
context 'with insufficient permissions' do
137113
before do
138114
project.add_reporter(user)

spec/features/projects/settings/operations_settings_spec.rb

+4-20
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,16 @@
88
let(:role) { :maintainer }
99

1010
before do
11-
stub_feature_flags(error_tracking: true)
1211
sign_in(user)
1312
project.add_role(user, role)
1413
end
1514

1615
describe 'Sidebar > Operations' do
17-
context 'when sidebar feature flag enabled' do
18-
it 'renders the settings link in the sidebar' do
19-
visit project_path(project)
20-
wait_for_requests
16+
it 'renders the settings link in the sidebar' do
17+
visit project_path(project)
18+
wait_for_requests
2119

22-
expect(page).to have_selector('a[title="Operations"]', visible: false)
23-
end
24-
end
25-
26-
context 'when sidebar feature flag disabled' do
27-
before do
28-
stub_feature_flags(error_tracking: false)
29-
end
30-
31-
it 'does not render the settings link in the sidebar' do
32-
visit project_path(project)
33-
wait_for_requests
34-
35-
expect(page).not_to have_selector('a[title="Operations"]', visible: false)
36-
end
20+
expect(page).to have_selector('a[title="Operations"]', visible: false)
3721
end
3822
end
3923
end

spec/views/projects/settings/operations/show.html.haml_spec.rb

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
describe 'Operations > Error Tracking' do
1515
before do
16-
stub_feature_flags(error_tracking: true)
17-
1816
project.add_reporter(user)
1917

2018
allow(view).to receive(:error_tracking_setting)

0 commit comments

Comments
 (0)