From ed82ab4117cbfc32767fe1f5f179cf3447cbaabb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 10 Dec 2013 12:08:40 +0200
Subject: [PATCH] Remove some deprecations and fir project helper specs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/helpers/projects_helper.rb           | 2 +-
 app/views/projects/notes/_note.html.haml | 2 +-
 spec/helpers/projects_helper_spec.rb     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 096cef02b2b..0141da1d071 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -82,7 +82,7 @@ module ProjectsHelper
   end
 
   def project_active_milestones
-    @project.milestones.active.order("due_date, title ASC").all
+    @project.milestones.active.order("due_date, title ASC")
   end
 
   def project_issues_trackers(current_tracker = nil)
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index e56e9153c2f..7dcc67127c1 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -10,7 +10,7 @@
           %i.icon-edit
           Edit
         &nbsp;
-        = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove this comment?', remote: true, class: "danger js-note-delete" do
+        = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: "danger js-note-delete" do
           %i.icon-trash.cred
           Remove
     = image_tag avatar_icon(note.author_email), class: "avatar s32"
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 8156bcdd999..114058e3095 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -11,12 +11,12 @@ describe ProjectsHelper do
     it "returns the correct issues trackers available with current tracker 'gitlab' selected" do
       project_issues_trackers('gitlab').should ==
           "<option value=\"redmine\">Redmine</option>\n" \
-          "<option value=\"gitlab\" selected=\"selected\">GitLab</option>"
+          "<option selected=\"selected\" value=\"gitlab\">GitLab</option>"
     end
 
     it "returns the correct issues trackers available with current tracker 'redmine' selected" do
       project_issues_trackers('redmine').should ==
-          "<option value=\"redmine\" selected=\"selected\">Redmine</option>\n" \
+          "<option selected=\"selected\" value=\"redmine\">Redmine</option>\n" \
           "<option value=\"gitlab\">GitLab</option>"
     end
   end
-- 
GitLab