diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-11 19:36:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-11 19:36:06 +0000 |
| commit | 294310f357532dd18cb8db4bd0e9aa7fb8c3a077 (patch) | |
| tree | 1dd18724397cc13d6e972d3542d46c96df61e988 /app | |
| parent | 0e1e42885a792145dafc6aa28165d069b1cb5c03 (diff) | |
| parent | 317c3883477c1af3db96fdbd7caeed46ceb67d72 (diff) | |
| download | gitlab-ce-294310f357532dd18cb8db4bd0e9aa7fb8c3a077.tar.gz | |
Merge branch '24397-load-labels-on-mr-tabs' into 'master'
Ensure labels are loaded for all "show" methods of MR Controller
Closes #24397
See merge request !7416
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 9f104d903cc..dff0213411c 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -507,6 +507,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.close end + labels define_pipelines_vars end |