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
Boxiang Sun
gitlab-ce
Commits
6021ab6f
Commit
6021ab6f
authored
Jul 02, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added html to response
parent
3b9bb25d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/javascripts/ide/components/merge_requests/info.vue
...assets/javascripts/ide/components/merge_requests/info.vue
+2
-2
lib/api/entities.rb
lib/api/entities.rb
+6
-0
No files found.
app/assets/javascripts/ide/components/merge_requests/info.vue
View file @
6021ab6f
...
...
@@ -53,11 +53,11 @@ export default {
<div
class=
"issuable-details"
>
<title-component
:issuable-ref=
"currentMergeRequest.iid"
:title-html=
"currentMergeRequest.title"
:title-html=
"currentMergeRequest.title
_html
"
:title-text=
"currentMergeRequest.title"
/>
<description-component
:description-html=
"currentMergeRequest.description"
:description-html=
"currentMergeRequest.description
_html
"
:description-text=
"currentMergeRequest.description"
:can-update=
"false"
/>
...
...
lib/api/entities.rb
View file @
6021ab6f
...
...
@@ -388,6 +388,12 @@ module API
expose
:id
,
:iid
expose
(
:project_id
)
{
|
entity
|
entity
&
.
project
.
try
(
:id
)
}
expose
:title
,
:description
expose
:title_html
do
|
entity
|
MarkupHelper
::
markdown_field
(
entity
,
:title
)
end
expose
:description_html
do
|
entity
|
MarkupHelper
::
markdown_field
(
entity
,
:description
)
end
expose
:state
,
:created_at
,
:updated_at
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