scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-10 17:03:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1076 from mlorb/ml-sci-2220

Browse source 
fix merge bananas
This commit is contained in:
mlorb 2018-04-04 16:59:19 +02:00 committed by GitHub
commit ab58354cbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/views/repositories/show.html.erb
View file

@ -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>