diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index 81531bb0ac0a92a3b45905beaa8fd6b8609056b6..cfc1bd99a2040e8a91ff549d7c72aa648ebdd718 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -6,7 +6,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
   before_filter :authorize_admin_project!, only: [:destroy, :create]
 
   def index
-    @branches = @project.protected_branches.all
+    @branches = @project.protected_branches.to_a
     @protected_branch = @project.protected_branches.new
   end
 
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 1d3a3ca1333608d6b618ee2f0fd2d0203fee1a3c..20656d297e502628db16be538a6e6d95e9f26070 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -113,7 +113,9 @@
                 The project can be committed to.
                 %br
                 %strong Once active this project shows up in the search and on the dashboard.
-              = link_to 'Unarchive', unarchive_project_path(@project), confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again.", method: :post, class: "btn btn-remove"
+              = link_to 'Unarchive', unarchive_project_path(@project),
+                  data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again." },
+                  method: :post, class: "btn btn-remove"
             - else
               %p
                 Archiving the project will mark its repository as read-only.
@@ -121,7 +123,9 @@
                 It is hidden from the dashboard and doesn't show up in searches.
                 %br
                 %strong Archived projects cannot be committed to!
-              = link_to 'Archive', archive_project_path(@project), confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to.", method: :post, class: "btn btn-remove"
+              = link_to 'Archive', archive_project_path(@project),
+                  data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
+                  method: :post, class: "btn btn-remove"
       - else
         %p.nothing_here_message Only the project owner can archive a project