diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-23 10:48:03 +1100 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-23 10:48:03 +1100 |
| commit | 103c69a988bf5ad7ab3b0e70bc88edd1dd723e79 (patch) | |
| tree | 92498c5376f46d91afafc910935b8ddfbcaf5bef /app/views/projects/merge_requests/_how_to_merge.html.haml | |
| parent | 69adf79234b586867eab8d0d130aff0083b7ef93 (diff) | |
| parent | 7834f63c07dd52965e3aa30262d2b8f130c955aa (diff) | |
| download | gitlab-ce-103c69a988bf5ad7ab3b0e70bc88edd1dd723e79.tar.gz | |
Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gke
Diffstat (limited to 'app/views/projects/merge_requests/_how_to_merge.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_how_to_merge.html.haml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml index 917ec7fdbda..54a661040ea 100644 --- a/app/views/projects/merge_requests/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/_how_to_merge.html.haml @@ -1,6 +1,3 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('how_to_merge') - #modal_merge_info.modal .modal-dialog .modal-content |