diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-12 12:58:05 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-12 12:58:05 +0000 |
| commit | d2ecbd747b148d965a7f7ab4f438ad02ca21faf9 (patch) | |
| tree | c50c706adde38e29b7b9cd4b0da2abe56f1de739 /app/controllers | |
| parent | 832824f46eced9c5e781bd41082a4743600fb050 (diff) | |
| parent | 485b8b86edaeed1ba3a8bf55df23ca6cbc1f015b (diff) | |
| download | gitlab-ce-d2ecbd747b148d965a7f7ab4f438ad02ca21faf9.tar.gz | |
Merge branch 'georgekoltsov/51260-add-filtering-to-bitbucket-server-import' into 'master'
Add BitBucketServerImport project filtering
See merge request gitlab-org/gitlab-ce!31420
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/import/bitbucket_server_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/import/bitbucket_server_controller.rb b/app/controllers/import/bitbucket_server_controller.rb index f71ea8642cd..dc72a4e4fd9 100644 --- a/app/controllers/import/bitbucket_server_controller.rb +++ b/app/controllers/import/bitbucket_server_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Import::BitbucketServerController < Import::BaseController + include ActionView::Helpers::SanitizeHelper + before_action :verify_bitbucket_server_import_enabled before_action :bitbucket_auth, except: [:new, :configure] before_action :validate_import_params, only: [:create] @@ -57,7 +59,7 @@ class Import::BitbucketServerController < Import::BaseController # rubocop: disable CodeReuse/ActiveRecord def status - @collection = bitbucket_client.repos(page_offset: page_offset, limit: limit_per_page) + @collection = bitbucket_client.repos(page_offset: page_offset, limit: limit_per_page, filter: sanitized_filter_param) @repos, @incompatible_repos = @collection.partition { |repo| repo.valid? } # Use the import URL to filter beyond what BaseService#find_already_added_projects @@ -147,4 +149,8 @@ class Import::BitbucketServerController < Import::BaseController def limit_per_page BitbucketServer::Paginator::PAGE_LENGTH end + + def sanitized_filter_param + sanitize(params[:filter]) + end end |