Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
See what's new at GitLab
4
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
GitFox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yamko
GitFox
Commits
ee8d2b95
Commit
ee8d2b95
authored
Jun 04, 2019
by
Eugene Shapovalov
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crash with assignees in MergeRequest.
parent
4214db40
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
app/src/main/java/ru/terrakok/gitlabclient/entity/issue/Issue.kt
.../main/java/ru/terrakok/gitlabclient/entity/issue/Issue.kt
+4
-2
app/src/main/java/ru/terrakok/gitlabclient/entity/mergerequest/MergeRequest.kt
...terrakok/gitlabclient/entity/mergerequest/MergeRequest.kt
+2
-1
app/src/main/java/ru/terrakok/gitlabclient/entity/target/Target.kt
...ain/java/ru/terrakok/gitlabclient/entity/target/Target.kt
+0
-1
app/src/main/java/ru/terrakok/gitlabclient/ui/issue/IssueInfoFragment.kt
...va/ru/terrakok/gitlabclient/ui/issue/IssueInfoFragment.kt
+1
-1
app/src/main/java/ru/terrakok/gitlabclient/ui/mergerequest/MergeRequestInfoFragment.kt
.../gitlabclient/ui/mergerequest/MergeRequestInfoFragment.kt
+1
-1
No files found.
app/src/main/java/ru/terrakok/gitlabclient/entity/issue/Issue.kt
View file @
ee8d2b95
...
...
@@ -15,7 +15,8 @@ data class Issue(
@SerializedName
(
"author"
)
val
author
:
ShortUser
,
@SerializedName
(
"milestone"
)
val
milestone
:
Milestone
?,
@SerializedName
(
"project_id"
)
val
projectId
:
Long
,
@SerializedName
(
"assignees"
)
val
assignees
:
List
<
ShortUser
>,
// Assignees can be null in MergeRequest, so assume it can be null too.
@SerializedName
(
"assignees"
)
val
assignees
:
List
<
ShortUser
>?,
@SerializedName
(
"updated_at"
)
val
updatedAt
:
ZonedDateTime
?,
@SerializedName
(
"title"
)
val
title
:
String
?,
@SerializedName
(
"created_at"
)
val
createdAt
:
ZonedDateTime
,
...
...
@@ -35,5 +36,6 @@ data class Issue(
@SerializedName
(
"merge_requests_count"
)
val
relatedMergeRequestCount
:
Int
,
@SerializedName
(
"time_stats"
)
val
timeStats
:
TimeStats
,
@SerializedName
(
"weight"
)
val
weight
:
Int
?,
@SerializedName
(
"discussion_locked"
)
val
discussionLocked
:
Boolean
@SerializedName
(
"discussion_locked"
)
val
discussionLocked
:
Boolean
,
@SerializedName
(
"assignee"
)
val
assignee
:
ShortUser
?
)
\ No newline at end of file
app/src/main/java/ru/terrakok/gitlabclient/entity/mergerequest/MergeRequest.kt
View file @
ee8d2b95
...
...
@@ -42,7 +42,8 @@ data class MergeRequest(
@SerializedName
(
"merged_by"
)
val
mergedBy
:
ShortUser
?,
@SerializedName
(
"merged_at"
)
val
mergedAt
:
ZonedDateTime
?,
@SerializedName
(
"changes"
)
val
changes
:
List
<
MergeRequestChange
>?,
@SerializedName
(
"assignees"
)
val
assignees
:
List
<
ShortUser
>,
// It sometimes can be null.
@SerializedName
(
"assignees"
)
val
assignees
:
List
<
ShortUser
>?,
@SerializedName
(
"time_stats"
)
val
timeStats
:
TimeStats
,
@SerializedName
(
"discussion_locked"
)
val
discussionLocked
:
Boolean
)
app/src/main/java/ru/terrakok/gitlabclient/entity/target/Target.kt
View file @
ee8d2b95
...
...
@@ -53,7 +53,6 @@ abstract class Target {
val
title
get
()
=
_title
!!
val
state
get
()
=
_state
!!
val
labels
get
()
=
_labels
!!
val
assignees
get
()
=
_assignees
!!
val
userNotesCount
get
()
=
_userNotesCount
!!
val
upVotes
get
()
=
_upVotes
!!
val
downVotes
get
()
=
_downVotes
!!
...
...
app/src/main/java/ru/terrakok/gitlabclient/ui/issue/IssueInfoFragment.kt
View file @
ee8d2b95
...
...
@@ -34,7 +34,7 @@ class IssueInfoFragment : BaseFragment(), IssueInfoView {
override
fun
showInfo
(
issue
:
Issue
)
{
with
(
issue
)
{
showAssignees
(
assignees
)
showAssignees
(
assignees
?:
assignee
?.
let
{
listOf
(
it
)
}
?:
emptyList
()
)
showMilestone
(
milestone
)
showDueDate
(
dueDate
)
showTimeStats
(
timeStats
)
...
...
app/src/main/java/ru/terrakok/gitlabclient/ui/mergerequest/MergeRequestInfoFragment.kt
View file @
ee8d2b95
...
...
@@ -35,7 +35,7 @@ class MergeRequestInfoFragment : BaseFragment(), MergeRequestInfoView {
override
fun
showInfo
(
mr
:
MergeRequest
)
{
with
(
mr
)
{
showAssignees
(
assignees
)
showAssignees
(
assignees
?:
assignee
?.
let
{
listOf
(
it
)
}
?:
emptyList
()
)
showMilestone
(
milestone
)
showMergeStatus
(
state
,
mergeStatus
)
showTimeStats
(
timeStats
)
...
...
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