3 files changed, 3 insertions, 34 deletions

diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
deleted file mode 100644
index 17134613b17..00000000000
--- a/app/views/projects/compare/_form.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-= form_tag project_compare_index_path(@project), method: :post, class: 'form-inline js-requires-input js-signature-container', data: { 'signatures-path' => signatures_namespace_project_compare_index_path } do
-  .form-group.dropdown.compare-form-group.to.js-compare-to-dropdown
-    .input-group.inline-input-group
-      %span.input-group-prepend
-        .input-group-text
-          = s_("CompareBranches|Source")
-      = hidden_field_tag :to, params[:to]
-      = button_tag type: 'button', title: params[:to], class: "btn gl-button form-control compare-dropdown-toggle js-compare-dropdown has-tooltip", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-to-dropdown", selected: params[:to], field_name: :to } do
-        .dropdown-toggle-text.str-truncated.monospace.float-left= params[:to] || _("Select branch/tag")
-        = sprite_icon('chevron-down', css_class: 'float-right')
-    = render 'shared/ref_dropdown'
-  .compare-ellipsis.inline ...
-  .form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
-    .input-group.inline-input-group
-      %span.input-group-prepend
-        .input-group-text
-          = s_("CompareBranches|Target")
-      = hidden_field_tag :from, params[:from]
-      = button_tag type: 'button', title: params[:from], class: "btn gl-button form-control compare-dropdown-toggle js-compare-dropdown has-tooltip", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do
-        .dropdown-toggle-text.str-truncated.monospace.float-left= params[:from] || _("Select branch/tag")
-        = sprite_icon('chevron-down', css_class: 'float-right')
-    = render 'shared/ref_dropdown'
-   
-  = button_tag s_("CompareBranches|Compare"), class: "btn gl-button btn-success commits-compare-btn"
-  - if @merge_request.present?
-    = link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'gl-ml-3 btn'
-  - elsif create_mr_button?
-    = link_to _("Create merge request"), create_mr_path, class: 'gl-ml-3 btn gl-button'
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 3f9aa24a569..e3ab184ec6f 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -13,8 +13,4 @@
   = html_escape(_("Changes are shown as if the %{b_open}source%{b_close} revision was being merged into the %{b_open}target%{b_close} revision.")) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe }
 
 .prepend-top-20
-  #js-compare-selector{ data: { project_compare_index_path: project_compare_index_path(@project),
-    refs_project_path: refs_project_path(@project),
-    params_from: params[:from], params_to: params[:to],
-    project_merge_request_path: @merge_request.present? ? project_merge_request_path(@project, @merge_request) : '',
-    create_mr_path: create_mr_button? ? create_mr_path : '' } }
+  #js-compare-selector{ data: project_compare_selector_data(@project, @merge_request, params) }
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 51cf95dc84b..9e9c271e7be 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -2,7 +2,8 @@
 - page_title "#{params[:from]}...#{params[:to]}"
 
 .sub-header-block.no-bottom-space
-  = render "form"
+  .js-signature-container{ data: { 'signatures-path' => signatures_namespace_project_compare_index_path } }
+    #js-compare-selector{ data: project_compare_selector_data(@project, @merge_request, params) }
 
 - if @commits.present?
   = render "projects/commits/commit_list"