diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
| commit | 9353c5c780c7af6d6ed3d6c501b155f82debc99c (patch) | |
| tree | 55d87571798f5ff10ee1431a296f1115251f67e9 /app/views/shared/milestones/_sidebar.html.haml | |
| parent | c287c01821c4db4830dbdd5263907f08c2ed4cc4 (diff) | |
| parent | e2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff) | |
| download | gitlab-ce-9353c5c780c7af6d6ed3d6c501b155f82debc99c.tar.gz | |
Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/views/shared/milestones/_sidebar.html.haml')
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index cd4188daf5b..a942ebc328b 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -1,7 +1,5 @@ - affix_offset = local_assigns.fetch(:affix_offset, "50") - project = local_assigns[:project] -- content_for :page_specific_javascripts do - = page_specific_javascript_bundle_tag('common_vue') %aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix", "always-show-toggle" => true }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } .issuable-sidebar.milestone-sidebar |