Merge branch 'remove-issues-import-csv-feature-flag' into 'master'
Remove import_issues_csv feature flag See merge request gitlab-org/gitlab-ce!24324
This commit is contained in:
commit
f598daf284
|
@ -178,8 +178,6 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def import_csv
|
||||
return render_404 unless Feature.enabled?(:issues_import_csv)
|
||||
|
||||
if uploader = UploadService.new(project, params[:file]).execute
|
||||
ImportIssuesCsvWorker.perform_async(current_user.id, project.id, uploader.upload.id)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- show_feed_buttons = local_assigns.fetch(:show_feed_buttons, true)
|
||||
- show_import_button = local_assigns.fetch(:show_import_button, true) && Feature.enabled?(:issues_import_csv) && can?(current_user, :import_issues, @project)
|
||||
- show_import_button = local_assigns.fetch(:show_import_button, true) && can?(current_user, :import_issues, @project)
|
||||
- show_export_button = local_assigns.fetch(:show_export_button, true)
|
||||
|
||||
.nav-controls.issues-nav-controls
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
- button_path = local_assigns.fetch(:button_path, false)
|
||||
- project_select_button = local_assigns.fetch(:project_select_button, false)
|
||||
- show_import_button = local_assigns.fetch(:show_import_button, false) && Feature.enabled?(:issues_import_csv) && can?(current_user, :import_issues, @project)
|
||||
- show_import_button = local_assigns.fetch(:show_import_button, false) && can?(current_user, :import_issues, @project)
|
||||
- has_button = button_path || project_select_button
|
||||
- closed_issues_count = issuables_count_for_state(:issues, :closed)
|
||||
- opened_issues_count = issuables_count_for_state(:issues, :opened)
|
||||
|
|
|
@ -1030,19 +1030,6 @@ describe Projects::IssuesController do
|
|||
let(:project) { create(:project, :public) }
|
||||
let(:file) { fixture_file_upload('spec/fixtures/csv_comma.csv') }
|
||||
|
||||
context 'feature disabled' do
|
||||
it 'returns 404' do
|
||||
sign_in(user)
|
||||
project.add_maintainer(user)
|
||||
|
||||
stub_feature_flags(issues_import_csv: false)
|
||||
|
||||
import_csv
|
||||
|
||||
expect(response).to have_gitlab_http_status :not_found
|
||||
end
|
||||
end
|
||||
|
||||
context 'unauthorized' do
|
||||
it 'returns 404 for guests' do
|
||||
sign_out(:user)
|
||||
|
|
Loading…
Reference in New Issue