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
Tatuya Kamada
gitlab-ce
Commits
b8bf2834
Commit
b8bf2834
authored
Nov 17, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rubocop fixes
parent
f25d64d4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/bitbucket/page.rb
lib/bitbucket/page.rb
+1
-1
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+1
-1
No files found.
lib/bitbucket/page.rb
View file @
b8bf2834
...
@@ -29,7 +29,7 @@ module Bitbucket
...
@@ -29,7 +29,7 @@ module Bitbucket
end
end
def
representation_class
(
type
)
def
representation_class
(
type
)
class_name
=
Bitbucket
::
Representation
.
const_get
(
type
.
to_s
.
camelize
)
Bitbucket
::
Representation
.
const_get
(
type
.
to_s
.
camelize
)
end
end
end
end
end
end
lib/gitlab/bitbucket_import/importer.rb
View file @
b8bf2834
...
@@ -139,7 +139,7 @@ module Gitlab
...
@@ -139,7 +139,7 @@ module Gitlab
line_code:
line_code_map
.
fetch
(
comment
.
iid
),
line_code:
line_code_map
.
fetch
(
comment
.
iid
),
type:
'LegacyDiffNote'
)
type:
'LegacyDiffNote'
)
note
=
merge_request
.
notes
.
create!
(
attributes
)
merge_request
.
notes
.
create!
(
attributes
)
rescue
ActiveRecord
::
RecordInvalid
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
Rails
.
log
.
error
(
"Bitbucket importer ERROR: Invalid pull request comment
#{
e
.
message
}
"
)
Rails
.
log
.
error
(
"Bitbucket importer ERROR: Invalid pull request comment
#{
e
.
message
}
"
)
nil
nil
...
...
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