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
d5aa36f1
Commit
d5aa36f1
authored
Feb 26, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable reply_to_individual_notes feature flag by default
parent
c9e5ce8d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+1
-1
app/models/individual_note_discussion.rb
app/models/individual_note_discussion.rb
+1
-1
changelogs/unreleased/winh-enable-reply_to_individual_notes.yml
...logs/unreleased/winh-enable-reply_to_individual_notes.yml
+5
-0
spec/features/merge_request/user_posts_notes_spec.rb
spec/features/merge_request/user_posts_notes_spec.rb
+2
-3
No files found.
app/controllers/concerns/issuable_actions.rb
View file @
d5aa36f1
...
@@ -8,7 +8,7 @@ module IssuableActions
...
@@ -8,7 +8,7 @@ module IssuableActions
before_action
:authorize_destroy_issuable!
,
only: :destroy
before_action
:authorize_destroy_issuable!
,
only: :destroy
before_action
:authorize_admin_issuable!
,
only: :bulk_update
before_action
:authorize_admin_issuable!
,
only: :bulk_update
before_action
only: :show
do
before_action
only: :show
do
push_frontend_feature_flag
(
:reply_to_individual_notes
)
push_frontend_feature_flag
(
:reply_to_individual_notes
,
default_enabled:
true
)
end
end
end
end
...
...
app/models/individual_note_discussion.rb
View file @
d5aa36f1
...
@@ -14,7 +14,7 @@ class IndividualNoteDiscussion < Discussion
...
@@ -14,7 +14,7 @@ class IndividualNoteDiscussion < Discussion
end
end
def
can_convert_to_discussion?
def
can_convert_to_discussion?
noteable
.
supports_replying_to_individual_notes?
&&
Feature
.
enabled?
(
:reply_to_individual_notes
)
noteable
.
supports_replying_to_individual_notes?
&&
Feature
.
enabled?
(
:reply_to_individual_notes
,
default_enabled:
true
)
end
end
def
convert_to_discussion!
(
save:
false
)
def
convert_to_discussion!
(
save:
false
)
...
...
changelogs/unreleased/winh-enable-reply_to_individual_notes.yml
0 → 100644
View file @
d5aa36f1
---
title
:
Add button to start discussion from single comment
merge_request
:
25575
author
:
type
:
added
spec/features/merge_request/user_posts_notes_spec.rb
View file @
d5aa36f1
...
@@ -67,7 +67,7 @@ describe 'Merge request > User posts notes', :js do
...
@@ -67,7 +67,7 @@ describe 'Merge request > User posts notes', :js do
end
end
end
end
describe
'when reply_to_individual_notes feature flag is
not set
'
do
describe
'when reply_to_individual_notes feature flag is
disabled
'
do
before
do
before
do
stub_feature_flags
(
reply_to_individual_notes:
false
)
stub_feature_flags
(
reply_to_individual_notes:
false
)
visit
project_merge_request_path
(
project
,
merge_request
)
visit
project_merge_request_path
(
project
,
merge_request
)
...
@@ -78,9 +78,8 @@ describe 'Merge request > User posts notes', :js do
...
@@ -78,9 +78,8 @@ describe 'Merge request > User posts notes', :js do
end
end
end
end
describe
'when reply_to_individual_notes feature flag is set'
do
describe
'when reply_to_individual_notes feature flag is
not
set'
do
before
do
before
do
stub_feature_flags
(
reply_to_individual_notes:
true
)
visit
project_merge_request_path
(
project
,
merge_request
)
visit
project_merge_request_path
(
project
,
merge_request
)
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