From 58433f4218cdef703b5e3a6606bd2c46e8a4af67 Mon Sep 17 00:00:00 2001
From: mlorb <mlorber@biosistemika.com>
Date: Wed, 4 Apr 2018 16:36:26 +0200
Subject: [PATCH] fix merge bananas

---
 app/views/repositories/show.html.erb | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 6d1efcba6..7f09afc85 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -81,29 +81,7 @@
                     remote: true %>
       <% end %>
     </div>
-
-    <div id="repository-columns-dropdown" class="dropdown">
-      <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-        <%= t('repositories.columns') %>
-        <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu dropdown-menu-right smart-dropdown" id="repository-columns-list">
-        <% if can_create_repository_columns?(@repository.team) %>
-          <li class="add-new-column-form">
-            <div id="new-column-form" class="form-group" data-action="<%= repository_repository_columns_path(@repository) %>">
-              <div class="input-group">
-                <input class="form-control" id="new-column-name" placeholder="<%= t("repositories.column_new_text") %>">
-                <span class="input-group-btn">
-                  <a id="add-new-column-button" class="btn btn-primary">
-                    <%= t("repositories.column_create") %>
-                  </a>
-                </span>
-              </div>
-            </div>
-          </li>
-        <% end %>
-      </ul>
-    </div>
+    <%= render partial: "columns_reorder_dropdown", formats: :html %>
   </div>
 </div>