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
7833d3fb
Commit
7833d3fb
authored
Oct 05, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve & simplify GitHub's representation classes
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
f50b95b0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
17 deletions
+15
-17
lib/github/import.rb
lib/github/import.rb
+2
-2
lib/github/representation/branch.rb
lib/github/representation/branch.rb
+6
-8
lib/github/representation/issue.rb
lib/github/representation/issue.rb
+1
-1
lib/github/representation/pull_request.rb
lib/github/representation/pull_request.rb
+6
-6
No files found.
lib/github/import.rb
View file @
7833d3fb
...
@@ -211,7 +211,7 @@ module Github
...
@@ -211,7 +211,7 @@ module Github
# for both features, like manipulating assignees, labels
# for both features, like manipulating assignees, labels
# and milestones, are provided within the Issues API.
# and milestones, are provided within the Issues API.
if
representation
.
pull_request?
if
representation
.
pull_request?
return
unless
representation
.
labels?
||
representation
.
has_
comments?
return
unless
representation
.
labels?
||
representation
.
comments?
merge_request
=
MergeRequest
.
find_by!
(
target_project_id:
project
.
id
,
iid:
representation
.
iid
)
merge_request
=
MergeRequest
.
find_by!
(
target_project_id:
project
.
id
,
iid:
representation
.
iid
)
...
@@ -248,7 +248,7 @@ module Github
...
@@ -248,7 +248,7 @@ module Github
end
end
def
fetch_comments_conditionally
(
issuable
,
representation
)
def
fetch_comments_conditionally
(
issuable
,
representation
)
if
representation
.
has_
comments?
if
representation
.
comments?
comments_url
=
"/repos/
#{
repo
}
/issues/
#{
issuable
.
iid
}
/comments"
comments_url
=
"/repos/
#{
repo
}
/issues/
#{
issuable
.
iid
}
/comments"
fetch_comments
(
issuable
,
:comment
,
comments_url
)
fetch_comments
(
issuable
,
:comment
,
comments_url
)
end
end
...
...
lib/github/representation/branch.rb
View file @
7833d3fb
...
@@ -7,10 +7,14 @@ module Github
...
@@ -7,10 +7,14 @@ module Github
raw
.
dig
(
'user'
,
'login'
)
||
'unknown'
raw
.
dig
(
'user'
,
'login'
)
||
'unknown'
end
end
def
repo?
raw
[
'repo'
].
present?
end
def
repo
def
repo
return
@repo
if
defined?
(
@repo
)
return
unless
repo?
@repo
=
Github
::
Representation
::
Repo
.
new
(
raw
[
'repo'
])
if
raw
[
'repo'
].
present?
@repo
||=
Github
::
Representation
::
Repo
.
new
(
raw
[
'repo'
])
end
end
def
ref
def
ref
...
@@ -25,12 +29,6 @@ module Github
...
@@ -25,12 +29,6 @@ module Github
Commit
.
truncate_sha
(
sha
)
Commit
.
truncate_sha
(
sha
)
end
end
def
exists?
return
@exists
if
defined?
(
@exists
)
@exists
=
repository
.
branch_exists?
(
ref
)
end
def
valid?
def
valid?
sha
.
present?
&&
ref
.
present?
sha
.
present?
&&
ref
.
present?
end
end
...
...
lib/github/representation/issue.rb
View file @
7833d3fb
...
@@ -5,7 +5,7 @@ module Github
...
@@ -5,7 +5,7 @@ module Github
raw
[
'state'
]
==
'closed'
?
'closed'
:
'opened'
raw
[
'state'
]
==
'closed'
?
'closed'
:
'opened'
end
end
def
has_
comments?
def
comments?
raw
[
'comments'
]
>
0
raw
[
'comments'
]
>
0
end
end
...
...
lib/github/representation/pull_request.rb
View file @
7833d3fb
module
Github
module
Github
module
Representation
module
Representation
class
PullRequest
<
Representation
::
Issuable
class
PullRequest
<
Representation
::
Issuable
delegate
:
user
,
:repo
,
:ref
,
:
sha
,
to: :source_branch
,
prefix:
true
delegate
:sha
,
to: :source_branch
,
prefix:
true
delegate
:
user
,
:exists?
,
:repo
,
:ref
,
:sha
,
:short_
sha
,
to: :target_branch
,
prefix:
true
delegate
:sha
,
to: :target_branch
,
prefix:
true
def
source_project
def
source_project
project
project
...
@@ -11,7 +11,7 @@ module Github
...
@@ -11,7 +11,7 @@ module Github
def
source_branch_name
def
source_branch_name
# Mimic the "user:branch" displayed in the MR widget,
# Mimic the "user:branch" displayed in the MR widget,
# i.e. "Request to merge rymai:add-external-mounts into master"
# i.e. "Request to merge rymai:add-external-mounts into master"
cross_project?
?
"
#{
source_branch
_user
}
:
#{
source_branch_ref
}
"
:
source_branch_
ref
cross_project?
?
"
#{
source_branch
.
user
}
:
#{
source_branch
.
ref
}
"
:
source_branch
.
ref
end
end
def
target_project
def
target_project
...
@@ -19,7 +19,7 @@ module Github
...
@@ -19,7 +19,7 @@ module Github
end
end
def
target_branch_name
def
target_branch_name
target_branch
_
ref
target_branch
.
ref
end
end
def
state
def
state
...
@@ -62,9 +62,9 @@ module Github
...
@@ -62,9 +62,9 @@ module Github
end
end
def
cross_project?
def
cross_project?
return
true
if
source_branch_repo
.
nil
?
return
true
unless
source_branch
.
repo
?
source_branch
_repo
.
id
!=
target_branch_
repo
.
id
source_branch
.
repo
.
id
!=
target_branch
.
repo
.
id
end
end
end
end
end
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