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
Boxiang Sun
gitlab-ce
Commits
aa5821e5
Commit
aa5821e5
authored
Aug 01, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assorted Bitbucket Server importer code cleanup based on review
parent
636bcebc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
11 deletions
+8
-11
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
+2
-5
lib/bitbucket_server/connection.rb
lib/bitbucket_server/connection.rb
+4
-4
lib/bitbucket_server/page.rb
lib/bitbucket_server/page.rb
+1
-1
No files found.
app/controllers/import/bitbucket_server_controller.rb
View file @
aa5821e5
...
...
@@ -13,7 +13,7 @@ class Import::BitbucketServerController < Import::BaseController
# Repository names are limited to 128 characters. They must start with a
# letter or number and may contain spaces, hyphens, underscores, and periods.
# (https://community.atlassian.com/t5/Answers-Developer-Questions/stash-repository-names/qaq-p/499054)
VALID_BITBUCKET_CHARS
=
/\A[
a-zA-z0-9
\-_\.\s]+\z/
VALID_BITBUCKET_CHARS
=
/\A[
\w
\-_\.\s]+\z/
def
new
end
...
...
app/views/import/bitbucket_server/status.html.haml
View file @
aa5821e5
...
...
@@ -41,12 +41,9 @@
=
link_to
project
.
full_path
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
%td
.job-status
-
if
project
.
import_status
==
'finished'
%span
%i
.fa.fa-check
Done
=
icon
(
'check'
,
text:
'Done'
)
-
elsif
project
.
import_status
==
'started'
%i
.fa.fa-spinner.fa-spin
started
=
icon
(
'spin'
,
text:
'started'
)
-
else
=
project
.
human_import_status_name
...
...
lib/bitbucket_server/connection.rb
View file @
aa5821e5
...
...
@@ -12,10 +12,10 @@ module BitbucketServer
ConnectionError
=
Class
.
new
(
StandardError
)
def
initialize
(
options
=
{})
@api_version
=
options
.
fetch
(
:api_version
,
DEFAULT_API_VERSION
)
@base_uri
=
options
[
:base_uri
]
@username
=
options
[
:user
]
@token
=
options
[
:password
]
@api_version
=
options
.
fetch
(
:api_version
,
DEFAULT_API_VERSION
)
@base_uri
=
options
[
:base_uri
]
@username
=
options
[
:user
]
@token
=
options
[
:password
]
end
def
get
(
path
,
extra_query
=
{})
...
...
lib/bitbucket_server/page.rb
View file @
aa5821e5
...
...
@@ -20,7 +20,7 @@ module BitbucketServer
private
def
parse_attrs
(
raw
)
raw
.
slice
(
*
%w(size nextPageStart isLastPage)
).
symbolize_keys
raw
.
slice
(
'size'
,
'nextPageStart'
,
'isLastPage'
).
symbolize_keys
end
def
parse_values
(
raw
,
bitbucket_rep_class
)
...
...
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