Merge pull request #735 from alexandermeindl/devel

#734 fix protected_branches list and sort order

Author: n-rodriguez

Diff for: app/controllers/repository_protected_branches_controller.rb

@@ -47,12 +47,12 @@ def clone
   end
 
   def sort
-    params[:repository_protected_branche].each_with_index do |id, index|
+    params[:protected_branch].each_with_index do |id, index|
       @repository.protected_branches.where(id: id).update_all(position: index + 1)
     end
     # Update Gitolite repository
     call_use_case
-    render nothing: true
+    head :ok
   end
 
   private

Diff for: app/views/repository_protected_branches/index.html.slim

@@ -10,7 +10,7 @@ div
     = link_to "(#{l(:label_gitolite_documentation)})", 'https://gitolite.com/gitolite/conf.html#rules', class: 'external'
 
   - if @repository_protected_branches.any?
-    table#protected_branches.table.table-hover data="update-url: #{sort_repository_protected_branches_url}", style: "opacity: #{@repository.protected_branches_enabled? ? '1' : '0.5'};" }
+    table#protected_branches.table.table-hover data-update-url="#{sort_repository_protected_branches_url}" style="opacity: #{@repository.protected_branches_enabled? ? '1' : '0.5'};"
       thead
         tr
           th