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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
1e5015b7
Commit
1e5015b7
authored
Jan 16, 2019
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for EE review comments
parent
17e0c017
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
ee/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
...rollers/projects/merge_requests/drafts_controller_spec.rb
+2
-1
ee/spec/helpers/ee/issuables_helper_spec.rb
ee/spec/helpers/ee/issuables_helper_spec.rb
+5
-1
lib/banzai/pipeline/broadcast_message_pipeline.rb
lib/banzai/pipeline/broadcast_message_pipeline.rb
+1
-1
No files found.
ee/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
View file @
1e5015b7
...
...
@@ -18,6 +18,7 @@ describe Projects::MergeRequests::DraftsController do
before
do
sign_in
(
user
)
stub_licensed_features
(
batch_comments:
true
)
stub_commonmark_sourcepos_disabled
end
describe
'GET #index'
do
...
...
@@ -77,7 +78,7 @@ describe Projects::MergeRequests::DraftsController do
expect
(
json_response
[
'position'
]).
to
be_present
expect
(
json_response
[
'file_hash'
]).
to
be_present
expect
(
json_response
[
'line_code'
]).
to
match
(
/\w+_\d+_\d+/
)
expect
(
json_response
[
'note_html'
]).
to
eq
(
'<p d
ata-sourcepos="1:1-1:29" d
ir="auto">This is a unpublished comment</p>'
)
expect
(
json_response
[
'note_html'
]).
to
eq
(
'<p dir="auto">This is a unpublished comment</p>'
)
end
it
'creates a draft note with quick actions'
do
...
...
ee/spec/helpers/ee/issuables_helper_spec.rb
View file @
1e5015b7
...
...
@@ -4,6 +4,10 @@ require 'spec_helper'
describe
IssuablesHelper
do
describe
'#issuable_initial_data'
do
before
do
stub_commonmark_sourcepos_disabled
end
it
'returns the correct data for an epic'
do
user
=
create
(
:user
)
epic
=
create
(
:epic
,
author:
user
,
description:
'epic text'
)
...
...
@@ -28,7 +32,7 @@ describe IssuablesHelper do
groupPath:
@group
.
path
,
initialTitleHtml:
epic
.
title
,
initialTitleText:
epic
.
title
,
initialDescriptionHtml:
'<p d
ata-sourcepos="1:1-1:9" d
ir="auto">epic text</p>'
,
initialDescriptionHtml:
'<p dir="auto">epic text</p>'
,
initialDescriptionText:
'epic text'
,
initialTaskStatus:
'0 of 0 tasks completed'
,
subepicsSupported:
Gitlab
::
Database
.
postgresql?
...
...
lib/banzai/pipeline/broadcast_message_pipeline.rb
View file @
1e5015b7
...
...
@@ -17,7 +17,7 @@ module Banzai
def
self
.
transform_context
(
context
)
super
(
context
).
merge
(
no_sourcepos:
true
no_sourcepos:
true
)
end
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