diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-14 19:22:49 -0200 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-14 19:22:49 -0200 |
commit | 6c796702a4dd89ae76215b4d99ec02a6e224b704 (patch) | |
tree | 44722c11b07e6b04a7ae01829eb1a097035680e8 /app | |
parent | f76b3106e85411c3526b88ae366ef7619241cb85 (diff) | |
download | gitlab-ce-6c796702a4dd89ae76215b4d99ec02a6e224b704.tar.gz |
Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ff
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/blob_controller.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 0718658cd48..2a6fe3b9c97 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -122,7 +122,7 @@ class Projects::BlobController < Projects::ApplicationController @lines.map! do |line| # These are marked as context lines but are loaded from blobs. # 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 end @@ -132,11 +132,6 @@ class Projects::BlobController < Projects::ApplicationController render json: DiffLineSerializer.new.represent(@lines) 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 return unless @form.unfold? |