diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-27 09:02:18 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-27 09:02:18 +0000 |
| commit | fc247b15f01c2975a78a5bc70d627952cbeedbfe (patch) | |
| tree | 28b83a936efa2ac3e7c14f8de860fbab54059872 /app/controllers | |
| parent | 0f058ff390f775d66f42fd204e1dd15137164331 (diff) | |
| parent | 3b158409b382014dba56e5bb6e66c298786af7f6 (diff) | |
| download | gitlab-ce-fc247b15f01c2975a78a5bc70d627952cbeedbfe.tar.gz | |
Merge branch 'remove-expand-diff-feature-flag' into 'master'
Remove expand diff to full file feature flag
See merge request gitlab-org/gitlab-ce!26614
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 2b78abc66df..5cf7fa3422d 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -16,10 +16,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action :authenticate_user!, only: [:assign_related_issues] before_action :check_user_can_push_to_source_branch!, only: [:rebase] - before_action only: [:show] do - push_frontend_feature_flag(:expand_diff_full_file) - end - def index @merge_requests = @issuables |