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
c1322ab9
Commit
c1322ab9
authored
Jul 03, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
karma & rubocop fixes
parent
5428e913
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
lib/api/entities.rb
lib/api/entities.rb
+2
-2
spec/javascripts/ide/stores/actions/merge_request_spec.js
spec/javascripts/ide/stores/actions/merge_request_spec.js
+3
-1
No files found.
lib/api/entities.rb
View file @
c1322ab9
...
@@ -533,10 +533,10 @@ module API
...
@@ -533,10 +533,10 @@ module API
class
MergeRequestBasic
<
ProjectEntity
class
MergeRequestBasic
<
ProjectEntity
expose
:title_html
,
if:
->
(
_
,
options
)
{
options
[
:render_html
]
}
do
|
entity
|
expose
:title_html
,
if:
->
(
_
,
options
)
{
options
[
:render_html
]
}
do
|
entity
|
MarkupHelper
::
markdown_field
(
entity
,
:title
)
MarkupHelper
.
markdown_field
(
entity
,
:title
)
end
end
expose
:description_html
,
if:
->
(
_
,
options
)
{
options
[
:render_html
]
}
do
|
entity
|
expose
:description_html
,
if:
->
(
_
,
options
)
{
options
[
:render_html
]
}
do
|
entity
|
MarkupHelper
::
markdown_field
(
entity
,
:description
)
MarkupHelper
.
markdown_field
(
entity
,
:description
)
end
end
expose
:target_branch
,
:source_branch
expose
:target_branch
,
:source_branch
expose
:upvotes
do
|
merge_request
,
options
|
expose
:upvotes
do
|
merge_request
,
options
|
...
...
spec/javascripts/ide/stores/actions/merge_request_spec.js
View file @
c1322ab9
...
@@ -39,7 +39,9 @@ describe('IDE store merge request actions', () => {
...
@@ -39,7 +39,9 @@ describe('IDE store merge request actions', () => {
store
store
.
dispatch
(
'
getMergeRequestData
'
,
{
projectId
:
'
abcproject
'
,
mergeRequestId
:
1
})
.
dispatch
(
'
getMergeRequestData
'
,
{
projectId
:
'
abcproject
'
,
mergeRequestId
:
1
})
.
then
(()
=>
{
.
then
(()
=>
{
expect
(
service
.
getProjectMergeRequestData
).
toHaveBeenCalledWith
(
'
abcproject
'
,
1
);
expect
(
service
.
getProjectMergeRequestData
).
toHaveBeenCalledWith
(
'
abcproject
'
,
1
,
{
render_html
:
true
,
});
done
();
done
();
})
})
...
...
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