diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-21 15:47:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-21 15:47:19 +0000 |
| commit | b5c3ad759342e61a597c32b62151d4ad076d4559 (patch) | |
| tree | 0b7d6889168573edf26b944940f51286eb246cee /app/controllers/projects/merge_requests_controller.rb | |
| parent | 0551364c60ff5f27ae10f5d0231bec8144332f5b (diff) | |
| parent | 8e5bf9d8dc0cc7ef683eb9bebfe7fbde79db6cf1 (diff) | |
| download | gitlab-ce-b5c3ad759342e61a597c32b62151d4ad076d4559.tar.gz | |
Merge branch 'backport-check-project-feature' into 'master'
Backport "check_project_feature_available!" from EE and use it for CE controllers
See merge request !12305
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index cbe73f9c1e3..164a8824277 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -7,7 +7,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController include ToggleAwardEmoji include IssuableCollections - before_action :module_enabled + before_action :check_merge_requests_available! before_action :merge_request, only: [ :edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :pipelines, :merge, :pipeline_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues, :commit_change_content @@ -461,10 +461,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController return render_404 unless @conflicts_list.can_be_resolved_by?(current_user) end - def module_enabled - return render_404 unless @project.feature_available?(:merge_requests, current_user) - end - def validates_merge_request # Show git not found page # if there is no saved commits between source & target branch |