kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'

Browse source 
Remove 'comment_on_any_diff_line' feature flag

Closes #54034

See merge request gitlab-org/gitlab-ce!23093
This commit is contained in:
Douwe Maan 2018-11-15 10:25:34 +00:00
commit b7cedd91e5
2 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/projects/blob_controller.rb
View file

@ -122,7 +122,7 @@ class Projects::BlobController < Projects::ApplicationController
@lines.map! do |line| @lines.map! do |line|
# These are marked as context lines but are loaded from blobs. # These are marked as context lines but are loaded from blobs.
# We also have context lines loaded from diffs in other places. # We also have context lines loaded from diffs in other places.
diff_line = Gitlab::Diff::Line.new(line, expanded_diff_line_type, nil, nil, nil) diff_line = Gitlab::Diff::Line.new(line, nil, nil, nil, nil)
diff_line.rich_text = line diff_line.rich_text = line
diff_line diff_line
end end
@ -132,11 +132,6 @@ class Projects::BlobController < Projects::ApplicationController
render json: DiffLineSerializer.new.represent(@lines) render json: DiffLineSerializer.new.represent(@lines)
end end
def expanded_diff_line_type
# Context lines can't receive comments.
Feature.enabled?(:comment_in_any_diff_line, @project) ? nil : 'context'
end
def add_match_line def add_match_line
return unless @form.unfold? return unless @form.unfold?

22
spec/controllers/projects/blob_controller_spec.rb
View file

@ -141,28 +141,6 @@ describe Projects::BlobController do
expect(lines.first).to have_key('rich_text') expect(lines.first).to have_key('rich_text')
end end
context 'comment in any diff line feature flag' do
it 'renders context lines when feature disabled' do
stub_feature_flags(comment_in_any_diff_line: false)
do_get(since: 1, to: 5, offset: 10, from_merge_request: true)
lines = JSON.parse(response.body)
all_context = lines.all? { |line| line['type'] == 'context' }
expect(all_context).to be(true)
end
it 'renders unchanged lines when feature enabled' do
stub_feature_flags(comment_in_any_diff_line: true)
do_get(since: 1, to: 5, offset: 10, from_merge_request: true)
lines = JSON.parse(response.body)
all_unchanged = lines.all? { |line| line['type'].nil? }
expect(all_unchanged).to be(true)
end
end
context 'when rendering match lines' do context 'when rendering match lines' do
it 'adds top match line when "since" is less than 1' do it 'adds top match line when "since" is less than 1' do
do_get(since: 5, to: 10, offset: 10, from_merge_request: true) do_get(since: 5, to: 10, offset: 10, from_merge_request: true)