diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-25 22:08:45 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-03-02 12:51:29 -0500 |
| commit | b41a274b62804d93e1dec57d8886d86602274dac (patch) | |
| tree | f051159d3a56be282c05dd25cb03b5ec4ff07b7f /app/controllers/concerns/merge_requests_action.rb | |
| parent | 0b86b46a2c0eeaa397d2dccb49bf51d096ac12c6 (diff) | |
| download | gitlab-ce-b41a274b62804d93e1dec57d8886d86602274dac.tar.gz | |
Don't list merge requests from archived projects in Group view.
Diffstat (limited to 'app/controllers/concerns/merge_requests_action.rb')
| -rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index f6de696e84d..9c49596bd0b 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -2,7 +2,7 @@ module MergeRequestsAction extend ActiveSupport::Concern def merge_requests - @merge_requests = get_merge_requests_collection + @merge_requests = get_merge_requests_collection.non_archived @merge_requests = @merge_requests.page(params[:page]).per(ApplicationController::PER_PAGE) @merge_requests = @merge_requests.preload(:author, :target_project) |