Commit a355bcac authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Stop loading MergeRequestEntity data on sidebar request

parent 7efa0aa0
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
......
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
......
...@@ -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}"
......
...@@ -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"] },
......
...@@ -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
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment