Commit ed82ab41 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Remove some deprecations and fir project helper specs

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 7c91055e
...@@ -82,7 +82,7 @@ module ProjectsHelper ...@@ -82,7 +82,7 @@ module ProjectsHelper
end end
def project_active_milestones def project_active_milestones
@project.milestones.active.order("due_date, title ASC").all @project.milestones.active.order("due_date, title ASC")
end end
def project_issues_trackers(current_tracker = nil) def project_issues_trackers(current_tracker = nil)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%i.icon-edit %i.icon-edit
Edit Edit
&nbsp; &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 %i.icon-trash.cred
Remove Remove
= image_tag avatar_icon(note.author_email), class: "avatar s32" = image_tag avatar_icon(note.author_email), class: "avatar s32"
......
...@@ -11,12 +11,12 @@ describe ProjectsHelper do ...@@ -11,12 +11,12 @@ describe ProjectsHelper do
it "returns the correct issues trackers available with current tracker 'gitlab' selected" do it "returns the correct issues trackers available with current tracker 'gitlab' selected" do
project_issues_trackers('gitlab').should == project_issues_trackers('gitlab').should ==
"<option value=\"redmine\">Redmine</option>\n" \ "<option value=\"redmine\">Redmine</option>\n" \
"<option value=\"gitlab\" selected=\"selected\">GitLab</option>" "<option selected=\"selected\" value=\"gitlab\">GitLab</option>"
end end
it "returns the correct issues trackers available with current tracker 'redmine' selected" do it "returns the correct issues trackers available with current tracker 'redmine' selected" do
project_issues_trackers('redmine').should == 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>" "<option value=\"gitlab\">GitLab</option>"
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment