diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue index 6c84684dedce2b992a8779c1e3b57c8cf52cc921..94c041231129e75ca1b717046c8f0ae725a73f3b 100644 --- a/app/assets/javascripts/import_entities/components/import_status.vue +++ b/app/assets/javascripts/import_entities/components/import_status.vue @@ -1,7 +1,6 @@ <script> import { GlAccordion, GlAccordionItem, GlBadge, GlIcon, GlLink } from '@gitlab/ui'; import { __, s__ } from '~/locale'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { STATISTIC_ITEMS } from '~/import/constants'; import { STATUSES } from '../constants'; @@ -58,7 +57,6 @@ export default { GlIcon, GlLink, }, - mixins: [glFeatureFlagMixin()], inject: { detailsPath: { default: undefined, @@ -116,11 +114,7 @@ export default { }, showDetails() { - return ( - Boolean(this.detailsPathForProject) && - this.glFeatures.importDetailsPage && - this.isIncomplete - ); + return Boolean(this.detailsPathForProject) && this.isIncomplete; }, detailsPathForProject() { diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index 12210afd44a0f64c79d1e732b4de9ca2f49d8de4..28732d58484854e54f9093e10fd60124cd7372bf 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -13,10 +13,6 @@ class Import::GithubController < Import::BaseController before_action :provider_auth, only: [:status, :realtime_changes, :create] before_action :expire_etag_cache, only: [:status, :create] - before_action only: [:status] do - push_frontend_feature_flag(:import_details_page) - end - rescue_from Octokit::Unauthorized, with: :provider_unauthorized rescue_from Octokit::TooManyRequests, with: :provider_rate_limit rescue_from Gitlab::GithubImport::RateLimitError, with: :rate_limit_threshold_exceeded @@ -73,9 +69,7 @@ def status end end - def details - render_404 unless Feature.enabled?(:import_details_page) - end + def details; end def create result = Import::GithubService.new(client, current_user, import_params).execute(access_params, provider_name) diff --git a/config/feature_flags/development/import_details_page.yml b/config/feature_flags/development/import_details_page.yml deleted file mode 100644 index d59e2945ae94cb8d2c31d23ee95f50c69225d4b0..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/import_details_page.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: import_details_page -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116090 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397650 -milestone: '15.11' -type: development -group: group::import -default_enabled: true diff --git a/spec/frontend/import_entities/components/import_status_spec.js b/spec/frontend/import_entities/components/import_status_spec.js index 103a3e4ddd189e55ac76018f61d6e6bc49fada38..37c58b9cdf86fe4efc468dd46b55b81b0b1aca26 100644 --- a/spec/frontend/import_entities/components/import_status_spec.js +++ b/spec/frontend/import_entities/components/import_status_spec.js @@ -168,18 +168,14 @@ describe('Import entities status component', () => { }; describe.each` - detailsPath | importDetailsPage | partialImport | expectLink - ${undefined} | ${false} | ${false} | ${false} - ${undefined} | ${false} | ${true} | ${false} - ${undefined} | ${true} | ${false} | ${false} - ${undefined} | ${true} | ${true} | ${false} - ${mockDetailsPath} | ${false} | ${false} | ${false} - ${mockDetailsPath} | ${false} | ${true} | ${false} - ${mockDetailsPath} | ${true} | ${false} | ${false} - ${mockDetailsPath} | ${true} | ${true} | ${true} + detailsPath | partialImport | expectLink + ${undefined} | ${false} | ${false} + ${undefined} | ${true} | ${false} + ${mockDetailsPath} | ${false} | ${false} + ${mockDetailsPath} | ${true} | ${true} `( - 'when detailsPath is $detailsPath, feature flag importDetailsPage is $importDetailsPage, partial import is $partialImport', - ({ detailsPath, importDetailsPage, partialImport, expectLink }) => { + 'when detailsPath is $detailsPath, partial import is $partialImport', + ({ detailsPath, partialImport, expectLink }) => { beforeEach(() => { createComponent( { @@ -190,7 +186,6 @@ describe('Import entities status component', () => { { provide: { detailsPath, - glFeatures: { importDetailsPage }, }, }, ); diff --git a/spec/requests/import/github_controller_spec.rb b/spec/requests/import/github_controller_spec.rb index 0f28f5e93f39d2df52be099d9014b9590ee15341..2499ef859dde0c2304be1dd0ec0868c6202e63c1 100644 --- a/spec/requests/import/github_controller_spec.rb +++ b/spec/requests/import/github_controller_spec.rb @@ -12,31 +12,13 @@ stub_application_setting(import_sources: ['github']) login_as(user) - end - - context 'with feature enabled' do - before do - stub_feature_flags(import_details_page: true) - - request - end - it 'responds with a 200 and shows the template', :aggregate_failures do - expect(response).to have_gitlab_http_status(:ok) - expect(response).to render_template(:details) - end + request end - context 'with feature disabled' do - before do - stub_feature_flags(import_details_page: false) - - request - end - - it 'responds with a 404' do - expect(response).to have_gitlab_http_status(:not_found) - end + it 'responds with a 200 and shows the template', :aggregate_failures do + expect(response).to have_gitlab_http_status(:ok) + expect(response).to render_template(:details) end end end