diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-15 16:13:14 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-15 16:13:14 +0800 |
| commit | a065ee341c599f9500cd0b52a873cdb71a0bce55 (patch) | |
| tree | 28277b71118c7f7385add7c8ae4493f1d964305b /app/controllers/concerns/merge_requests_action.rb | |
| parent | 188c231304845ff29506dc152aaea6ec42373015 (diff) | |
| parent | 1452729304393978ec93b712130dff6687db01b9 (diff) | |
| download | gitlab-ce-a065ee341c599f9500cd0b52a873cdb71a0bce55.tar.gz | |
Merge remote-tracking branch 'upstream/master' into use-update-runner-service
* upstream/master: (488 commits)
Remove duplicate CHANGELOG.md entries for 8.16.5
Update CHANGELOG.md for 8.14.9
Update CHANGELOG.md for 8.15.6
#27631: Add missing top-area div to activity header page
Update CHANGELOG.md for 8.16.5
Update CHANGELOG.md for 8.16.5
Update CHANGELOG.md for 8.16.5
Fix yarn lock and package.json mismatch caused by MR 9133
sync yarn.lock with recent changes to package.json
Add changelog
Fix z index bugs
Add Links to Branches in Calendar Activity
SidekiqStatus need to be qualified in some cases
Replace static fixture for behaviors/requires_input_spec.js (!9162)
API: Consolidate /projects endpoint
Add MySQL info in install requirements
Fix timezone on issue boards due date
Use Gitlab::Database.with_connection_pool from !9192
Disconnect the pool after done
Use threads directly, introduce pool later:
...
Diffstat (limited to 'app/controllers/concerns/merge_requests_action.rb')
| -rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index fdb05bb3228..6229759dcf1 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -7,6 +7,9 @@ module MergeRequestsAction @merge_requests = merge_requests_collection .page(params[:page]) + + @collection_type = "MergeRequest" + @issuable_meta_data = issuable_meta_data(@merge_requests) end private |