Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
91353779
Commit
91353779
authored
Aug 02, 2019
by
George Koltsov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add changelog entry
parent
1c2554bf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
8 deletions
+14
-8
app/controllers/import/bitbucket_server_controller.rb
app/controllers/import/bitbucket_server_controller.rb
+1
-1
app/views/import/bitbucket_server/status.html.haml
app/views/import/bitbucket_server/status.html.haml
+7
-6
changelogs/unreleased/georgekoltsov-51260-add-filtering-to-bitbucket-server-import.yml
...oltsov-51260-add-filtering-to-bitbucket-server-import.yml
+5
-0
lib/bitbucket_server/client.rb
lib/bitbucket_server/client.rb
+1
-1
No files found.
app/controllers/import/bitbucket_server_controller.rb
View file @
91353779
...
...
@@ -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
...
...
app/views/import/bitbucket_server/status.html.haml
View file @
91353779
...
...
@@ -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
...
...
@@ -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
...
...
changelogs/unreleased/georgekoltsov-51260-add-filtering-to-bitbucket-server-import.yml
0 → 100644
View file @
91353779
---
title
:
Add BitBucket project import filtering
merge_request
:
31420
author
:
type
:
added
lib/bitbucket_server/client.rb
View file @
91353779
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment