diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 1dc4c393bf242feccb6b25e73f1ab78843f194d1..2f042ea64178e6850141c89b33c730e60e7dc60f 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -282,10 +282,6 @@ def merge_request_header(project, merge_request) _('%{author} requested to merge %{source_branch} %{copy_button} into %{target_branch} %{created_at}').html_safe % { author: link_to_author.html_safe, source_branch: merge_request_source_branch(merge_request).html_safe, copy_button: copy_button.html_safe, target_branch: target_branch.html_safe, created_at: time_ago_with_tooltip(merge_request.created_at, html_class: 'gl-display-inline-block').html_safe } end - def single_file_file_by_file? - Feature.enabled?(:single_file_file_by_file, @project) - end - def sticky_header_data data = { iid: @merge_request.iid, diff --git a/config/feature_flags/development/single_file_file_by_file.yml b/config/feature_flags/development/single_file_file_by_file.yml deleted file mode 100644 index bc38cf8afb272bbebc251d06af0a20b6318fdb61..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/single_file_file_by_file.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: single_file_file_by_file -introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111895' -rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403571' -milestone: '15.11' -type: development -group: group::code review -default_enabled: true