diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-30 12:18:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-30 12:18:26 +0000 |
| commit | 4a01b5e293ccb358d77ac1a25b92d14fd913a4d7 (patch) | |
| tree | 6b8b6eb18aef4c5d37430d9ab59c01b9ee1469bb /app/controllers/projects | |
| parent | 7b2af8740dfa080bcb880fef64de4b99e2255dd4 (diff) | |
| parent | b4ce4e6f067bfb2ff0040aefb5884e873f1b8df8 (diff) | |
| download | gitlab-ce-4a01b5e293ccb358d77ac1a25b92d14fd913a4d7.tar.gz | |
Merge branch 'functional-closed-sidebar' into 'master'
Functional closed sidebar
Adds functionality to include the closed sidebar.
When sidebar is closed the details will be visible once changed in open sidebar.
This MR fixes some bugs and adds some features from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3175
Fixes: #13594
See merge request !3411
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6189de09f27..0b0ad984eb4 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -154,7 +154,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.target_project, @merge_request]) end format.json do - render json: @merge_request.to_json(include: [:milestone, :labels, :assignee]) + render json: @merge_request.to_json(include: [:milestone, :labels, assignee: { methods: :avatar_url }]) end end else |