diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-30 11:54:21 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-30 11:54:21 +0100 |
| commit | 4ab4737148af9b205e840eafca178fdd73be2f79 (patch) | |
| tree | a397f489cfe4696f14d1ec7ed3e11138eec3c93f /app/views/projects/merge_requests/_show.html.haml | |
| parent | 2efee5f6410f4e8e40e9b0339393de80f4affdde (diff) | |
| download | gitlab-ce-4ab4737148af9b205e840eafca178fdd73be2f79.tar.gz | |
Added resolve line comment button
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 2ec96308fd7..046d6567336 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -2,6 +2,9 @@ - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes +- content_for :page_specific_javascripts do + = page_specific_javascript_tag('line_comments/application.js') + - if diff_view == 'parallel' - fluid_layout true |