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
Jérome Perrin
gitlab-ce
Commits
a355bcac
Commit
a355bcac
authored
May 18, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop loading MergeRequestEntity data on sidebar request
parent
7efa0aa0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
4 deletions
+4
-4
app/serializers/merge_request_basic_entity.rb
app/serializers/merge_request_basic_entity.rb
+1
-0
app/serializers/merge_request_entity.rb
app/serializers/merge_request_entity.rb
+0
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
spec/fixtures/api/schemas/entities/merge_request.json
spec/fixtures/api/schemas/entities/merge_request.json
+0
-1
spec/fixtures/api/schemas/entities/merge_request_basic.json
spec/fixtures/api/schemas/entities/merge_request_basic.json
+2
-1
No files found.
app/serializers/merge_request_basic_entity.rb
View file @
a355bcac
class
MergeRequestBasicEntity
<
Grape
::
Entity
class
MergeRequestBasicEntity
<
Grape
::
Entity
expose
:assignee_id
expose
:merge_status
expose
:merge_status
expose
:merge_error
expose
:merge_error
expose
:state
expose
:state
...
...
app/serializers/merge_request_entity.rb
View file @
a355bcac
class
MergeRequestEntity
<
IssuableEntity
class
MergeRequestEntity
<
IssuableEntity
include
RequestAwareEntity
include
RequestAwareEntity
expose
:assignee_id
expose
:in_progress_merge_commit_sha
expose
:in_progress_merge_commit_sha
expose
:locked_at
expose
:locked_at
expose
:merge_commit_sha
expose
:merge_commit_sha
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
a355bcac
...
@@ -140,7 +140,7 @@
...
@@ -140,7 +140,7 @@
:javascript
:javascript
gl
.
sidebarOptions
=
{
gl
.
sidebarOptions
=
{
endpoint
:
"
#{
issuable_json_path
(
issuable
)
}
"
,
endpoint
:
"
#{
issuable_json_path
(
issuable
)
}
?basic=true
"
,
editable
:
#{
can_edit_issuable
?
true
:
false
}
,
editable
:
#{
can_edit_issuable
?
true
:
false
}
,
currentUser
:
#{
current_user
.
to_json
(
only:
[
:username
,
:id
,
:name
],
methods: :avatar_url
)
}
,
currentUser
:
#{
current_user
.
to_json
(
only:
[
:username
,
:id
,
:name
],
methods: :avatar_url
)
}
,
rootPath
:
"
#{
root_path
}
"
rootPath
:
"
#{
root_path
}
"
...
...
spec/fixtures/api/schemas/entities/merge_request.json
View file @
a355bcac
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
"properties"
:
{
"properties"
:
{
"id"
:
{
"type"
:
"integer"
},
"id"
:
{
"type"
:
"integer"
},
"iid"
:
{
"type"
:
"integer"
},
"iid"
:
{
"type"
:
"integer"
},
"assignee_id"
:
{
"type"
:
[
"integer"
,
"null"
]
},
"author_id"
:
{
"type"
:
"integer"
},
"author_id"
:
{
"type"
:
"integer"
},
"description"
:
{
"type"
:
[
"string"
,
"null"
]
},
"description"
:
{
"type"
:
[
"string"
,
"null"
]
},
"lock_version"
:
{
"type"
:
[
"string"
,
"null"
]
},
"lock_version"
:
{
"type"
:
[
"string"
,
"null"
]
},
...
...
spec/fixtures/api/schemas/entities/merge_request_basic.json
View file @
a355bcac
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
"total_time_spent"
:
{
"type"
:
"integer"
},
"total_time_spent"
:
{
"type"
:
"integer"
},
"human_time_estimate"
:
{
"type"
:
[
"string"
,
"null"
]
},
"human_time_estimate"
:
{
"type"
:
[
"string"
,
"null"
]
},
"human_total_time_spent"
:
{
"type"
:
[
"string"
,
"null"
]
},
"human_total_time_spent"
:
{
"type"
:
[
"string"
,
"null"
]
},
"merge_error"
:
{
"type"
:
[
"string"
,
"null"
]
}
"merge_error"
:
{
"type"
:
[
"string"
,
"null"
]
},
"assignee_id"
:
{
"type"
:
[
"integer"
,
"null"
]
}
},
},
"additionalProperties"
:
false
"additionalProperties"
:
false
}
}
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