diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-03 10:13:59 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-05 15:44:55 +0100 |
| commit | c1322ab99272eb082d2181df6d12f5010525812e (patch) | |
| tree | 3731261a7ae33fcc97d492a61c9ce1adcd103bd1 | |
| parent | 5428e913749b0c3b8f306167f585295434d944d6 (diff) | |
| download | gitlab-ce-c1322ab99272eb082d2181df6d12f5010525812e.tar.gz | |
karma & rubocop fixes
| -rw-r--r-- | lib/api/entities.rb | 4 | ||||
| -rw-r--r-- | spec/javascripts/ide/stores/actions/merge_request_spec.js | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 27b4ee83773..40df1e79bc7 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -533,10 +533,10 @@ module API class MergeRequestBasic < ProjectEntity expose :title_html, if: -> (_, options) { options[:render_html] } do |entity| - MarkupHelper::markdown_field(entity, :title) + MarkupHelper.markdown_field(entity, :title) end expose :description_html, if: -> (_, options) { options[:render_html] } do |entity| - MarkupHelper::markdown_field(entity, :description) + MarkupHelper.markdown_field(entity, :description) end expose :target_branch, :source_branch expose :upvotes do |merge_request, options| diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js index c99ccc70c6a..90c28c769f7 100644 --- a/spec/javascripts/ide/stores/actions/merge_request_spec.js +++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js @@ -39,7 +39,9 @@ describe('IDE store merge request actions', () => { store .dispatch('getMergeRequestData', { projectId: 'abcproject', mergeRequestId: 1 }) .then(() => { - expect(service.getProjectMergeRequestData).toHaveBeenCalledWith('abcproject', 1); + expect(service.getProjectMergeRequestData).toHaveBeenCalledWith('abcproject', 1, { + render_html: true, + }); done(); }) |