Skip to content
Snippets Groups Projects
Commit 91353779 authored by George Koltsov's avatar George Koltsov
Browse files

Add changelog entry

parent 1c2554bf
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -57,7 +57,7 @@ class Import::BitbucketServerController < Import::BaseController
 
# rubocop: disable CodeReuse/ActiveRecord
def status
@collection = bitbucket_client.repos(page_offset: page_offset, limit: limit_per_page, filter: params[:filter_bitbucket_projects])
@collection = bitbucket_client.repos(page_offset: page_offset, limit: limit_per_page, filter: params[:filter])
@repos, @incompatible_repos = @collection.partition { |repo| repo.valid? }
 
# Use the import URL to filter beyond what BaseService#find_already_added_projects
Loading
Loading
Loading
Loading
@@ -17,12 +17,13 @@
= button_tag class: 'btn btn-import btn-success js-import-all' do
= _('Import all projects')
= icon('spinner spin', class: 'loading-icon')
.btn-group
= link_to('Reconfigure', configure_import_bitbucket_server_path, class: 'btn btn-primary', method: :post)
 
.input-btn-group.float-right
= form_tag status_import_bitbucket_server_path, :method => 'get' do
= text_field_tag :filter_bitbucket_projects, params[:filter_bitbucket_projects], class: 'form-control', placeholder: _('Filter your projects by name'), size: 40
.btn-group
= link_to('Reconfigure', configure_import_bitbucket_server_path, class: 'btn btn-primary', method: :post)
.input-btn-group.float-right
= form_tag status_import_bitbucket_server_path, :method => 'get' do
= text_field_tag :filter, params[:filter], class: 'form-control append-bottom-10', placeholder: _('Filter your projects by name'), size: 40, autoFocus: true
 
.table-responsive.prepend-top-10
%table.table.import-jobs
Loading
Loading
@@ -66,7 +67,7 @@
= text_field_tag :path, current_user.namespace_path, class: "input-group-text input-large form-control", tabindex: 1, disabled: true
%span.input-group-prepend
.input-group-text /
= text_field_tag :path, sanitize_project_name(repo.slug), class: "input-mini form-control", tabindex: 2, autofocus: true, required: true
= text_field_tag :path, sanitize_project_name(repo.slug), class: "input-mini form-control", tabindex: 2, required: true
%td.import-actions.job-status
= button_tag class: 'btn btn-import js-add-to-import' do
Import
Loading
Loading
---
title: Add BitBucket project import filtering
merge_request: 31420
author:
type: added
Loading
Loading
@@ -25,7 +25,7 @@ module BitbucketServer
 
def repos(page_offset: 0, limit: nil, filter: nil)
path = "/repos"
path += "?q=name=#{filter}" if filter
path += "?name=#{filter}" if filter
get_collection(path, :repo, page_offset: page_offset, limit: limit)
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment