home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

Remove some deprecations and fir project helper specs

Browse Source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2013-12-10 12:11:29 +02:00
parent 7c91055e4a
commit ed82ab4117
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/projects_helper.rb
+1 -1
View File
@@ -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)
app/views/projects/notes/_note.html.haml
+1 -1
View File
@@ -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"
spec/helpers/projects_helper_spec.rb
+2 -2
View File
@@ -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