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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d7c79839
Commit
d7c79839
authored
Jun 25, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip
parent
7b94e805
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/services/projects/import_service.rb
app/services/projects/import_service.rb
+1
-1
lib/gitlab/bitbucket_server_import/importer.rb
lib/gitlab/bitbucket_server_import/importer.rb
+1
-1
No files found.
app/services/projects/import_service.rb
View file @
d7c79839
...
...
@@ -23,7 +23,7 @@ module Projects
success
rescue
=>
e
error
(
"Error importing repository
#{
project
.
import_url
}
into
#{
project
.
full_path
}
-
#{
e
.
message
}
"
)
error
(
"Error importing repository
#{
project
.
import_url
}
into
#{
project
.
full_path
}
-
#{
e
.
message
}
#{
e
.
backtrace
.
join
(
"
\n
"
)
}
"
)
end
private
...
...
lib/gitlab/bitbucket_server_import/importer.rb
View file @
d7c79839
...
...
@@ -89,7 +89,7 @@ module Gitlab
updated_at:
pull_request
.
updated_at
)
import_pull_request_comments
(
pull_request
,
merge_request
)
if
merge_request
.
persisted?
#
import_pull_request_comments(pull_request, merge_request) if merge_request.persisted?
rescue
StandardError
=>
e
errors
<<
{
type: :pull_request
,
iid:
pull_request
.
iid
,
errors:
e
.
message
,
trace:
e
.
backtrace
.
join
(
"
\n
"
),
raw_response:
pull_request
.
raw
}
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