diff options
| author | Alex Sanford <alex.sanford1@gmail.com> | 2016-11-10 20:04:28 -0400 |
|---|---|---|
| committer | Alex Sanford <alex.sanford1@gmail.com> | 2016-11-11 14:06:43 -0400 |
| commit | 317c3883477c1af3db96fdbd7caeed46ceb67d72 (patch) | |
| tree | 9f931d6375325670709b5db1b97cdc0828b2e52b /app/controllers/projects/merge_requests_controller.rb | |
| parent | 8458f53c6922c0c4d160df2fc929e08060c28f60 (diff) | |
| download | gitlab-ce-317c3883477c1af3db96fdbd7caeed46ceb67d72.tar.gz | |
Ensure labels are loaded on "show" methods of MR
Previously, they were only being loaded on the actual `show` action, but
not the actions representing the tabs (commits, builds, etc).
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -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 |