diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-28 20:59:13 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-28 20:59:13 +0000 |
| commit | 55df9a70bf3fb7fffa7491d53d3cf643d61de1c8 (patch) | |
| tree | e05fc8ee8d030e208abaa26272fceb1b06a87b94 /app/views/projects/merge_requests/_show.html.haml | |
| parent | 3385696bcecd5bf9a68cd4130b8a79a0b3557c34 (diff) | |
| parent | 5449296fd60b0d620eef64a875a0796712c7ac79 (diff) | |
| download | gitlab-ce-55df9a70bf3fb7fffa7491d53d3cf643d61de1c8.tar.gz | |
Merge branch 'functional-sidebar' into 'master'
Updates sidebar to use new dropdowns for issues and merge requests
Fixes #12935, #13164
See merge request !3175
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index ee5b9fd95a8..1dd8f721f7e 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -10,7 +10,7 @@ .merge-request{'data-url' => merge_request_path(@merge_request)} = render "projects/merge_requests/show/mr_title" - .merge-request-details.issuable-details + .merge-request-details.issuable-details{data: {id: @merge_request.project.id}} = render "projects/merge_requests/show/mr_box" .append-bottom-default.mr-source-target.prepend-top-default - if @merge_request.open? |