Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 14:08:40 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 14:11:29 +0400
commited82ab4117cbfc32767fe1f5f179cf3447cbaabb (patch)
tree5a51e9d2e5440907244d1b51a2eb39bb6f5894ab /app
parent7c91055e4a44d2b8096756ffcfb090a61c967a5d (diff)
Remove some deprecations and fir project helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/helpers/projects_helper.rb2
-rw-r--r--app/views/projects/notes/_note.html.haml2
2 files changed, 2 insertions, 2 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"