diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-01-23 18:40:25 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-02-09 17:40:37 -0200 |
| commit | 0b14b654b6e5d936f7241dcc0c249e0d4cc42728 (patch) | |
| tree | 714fff562236a7cbc78d837cea8ff7a648923166 /app/controllers/projects/merge_requests_controller.rb | |
| parent | c4fd6ff407cff8f2f742997a7400ba940a1fce5f (diff) | |
| download | gitlab-ce-0b14b654b6e5d936f7241dcc0c249e0d4cc42728.tar.gz | |
Gather issuable metadata to avoid n+ queries on index viewissue_25900_2
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index fbad66c5c40..c3e1760f168 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -36,8 +36,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController before_action :authorize_can_resolve_conflicts!, only: [:conflicts, :conflict_for_path, :resolve_conflicts] def index - @merge_requests = merge_requests_collection - @merge_requests = @merge_requests.page(params[:page]) + @collection_type = "MergeRequest" + @merge_requests = merge_requests_collection + @merge_requests = @merge_requests.page(params[:page]) + @issuable_meta_data = issuable_meta_data(@merge_requests) + if @merge_requests.out_of_range? && @merge_requests.total_pages != 0 return redirect_to url_for(params.merge(page: @merge_requests.total_pages)) end |