Remove the project_cleanup feature flag
This commit is contained in:
		
							parent
							
								
									0b74b86367
								
							
						
					
					
						commit
						e8a675d35f
					
				|  | @ -5,7 +5,6 @@ module Projects | |||
|     class RepositoryController < Projects::ApplicationController | ||||
|       before_action :authorize_admin_project! | ||||
|       before_action :remote_mirror, only: [:show] | ||||
|       before_action :check_cleanup_feature_flag!, only: :cleanup | ||||
| 
 | ||||
|       def show | ||||
|         render_show | ||||
|  | @ -37,10 +36,6 @@ module Projects | |||
| 
 | ||||
|       private | ||||
| 
 | ||||
|       def check_cleanup_feature_flag! | ||||
|         render_404 unless ::Feature.enabled?(:project_cleanup, project) | ||||
|       end | ||||
| 
 | ||||
|       def render_show | ||||
|         @deploy_keys = DeployKeysPresenter.new(@project, current_user: current_user) | ||||
|         @deploy_tokens = @project.deploy_tokens.active | ||||
|  |  | |||
|  | @ -1,5 +1,3 @@ | |||
| - return unless Feature.enabled?(:project_cleanup, @project) | ||||
| 
 | ||||
| - expanded = Rails.env.test? | ||||
| 
 | ||||
| %section.settings.no-animate#cleanup{ class: ('expanded' if expanded) } | ||||
|  |  | |||
|  | @ -19,35 +19,15 @@ describe Projects::Settings::RepositoryController do | |||
|   end | ||||
| 
 | ||||
|   describe 'PUT cleanup' do | ||||
|     before do | ||||
|       allow(RepositoryCleanupWorker).to receive(:perform_async) | ||||
|     end | ||||
|     let(:object_map) { fixture_file_upload('spec/fixtures/bfg_object_map.txt') } | ||||
| 
 | ||||
|     def do_put! | ||||
|       object_map = fixture_file_upload('spec/fixtures/bfg_object_map.txt') | ||||
|     it 'enqueues a RepositoryCleanupWorker' do | ||||
|       allow(RepositoryCleanupWorker).to receive(:perform_async) | ||||
| 
 | ||||
|       put :cleanup, namespace_id: project.namespace, project_id: project, project: { object_map: object_map } | ||||
|     end | ||||
| 
 | ||||
|     context 'feature enabled' do | ||||
|       it 'enqueues a RepositoryCleanupWorker' do | ||||
|         stub_feature_flags(project_cleanup: true) | ||||
| 
 | ||||
|         do_put! | ||||
| 
 | ||||
|       expect(response).to redirect_to project_settings_repository_path(project) | ||||
|       expect(RepositoryCleanupWorker).to have_received(:perform_async).once | ||||
|     end | ||||
|   end | ||||
| 
 | ||||
|     context 'feature disabled' do | ||||
|       it 'shows a 404 error' do | ||||
|         stub_feature_flags(project_cleanup: false) | ||||
| 
 | ||||
|         do_put! | ||||
| 
 | ||||
|         expect(response).to have_gitlab_http_status(404) | ||||
|       end | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -200,10 +200,7 @@ describe 'Projects > Settings > Repository settings' do | |||
|     context 'repository cleanup settings' do | ||||
|       let(:object_map_file) { Rails.root.join('spec', 'fixtures', 'bfg_object_map.txt') } | ||||
| 
 | ||||
|       context 'feature enabled' do | ||||
|       it 'uploads an object map file', :js do | ||||
|           stub_feature_flags(project_cleanup: true) | ||||
| 
 | ||||
|         visit project_settings_repository_path(project) | ||||
| 
 | ||||
|         expect(page).to have_content('Repository cleanup') | ||||
|  | @ -220,16 +217,5 @@ describe 'Projects > Settings > Repository settings' do | |||
|         expect(RepositoryCleanupWorker.jobs.count).to eq(1) | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|       context 'feature disabled' do | ||||
|         it 'does not show the settings' do | ||||
|           stub_feature_flags(project_cleanup: false) | ||||
| 
 | ||||
|           visit project_settings_repository_path(project) | ||||
| 
 | ||||
|           expect(page).not_to have_content('Repository cleanup') | ||||
|         end | ||||
|       end | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue