summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-31 09:20:27 +0200
committerRémy Coutable <remy@rymai.me>2016-03-31 09:20:27 +0200
commit091b8a6ede2515bb555ec8662b9d933d70bda3e9 (patch)
treede0fdf7c7e3559debe86a29c1a9fd309c122ab73
parent0af8587d88bd03d107438343b7895ad30f7a9308 (diff)
downloadgitlab-ce-091b8a6ede2515bb555ec8662b9d933d70bda3e9.tar.gz
Rename Note#for_project_snippet? to #for_snippet?
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/models/note.rb2
-rw-r--r--app/services/todo_service.rb2
-rw-r--r--lib/gitlab/note_data_builder.rb2
-rw-r--r--lib/gitlab/url_builder.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index b0c33f2eec5..87ced65c650 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -311,7 +311,7 @@ class Note < ActiveRecord::Base
for_merge_request? && for_diff_line?
end
- def for_project_snippet?
+ def for_snippet?
noteable_type == "Snippet"
end
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index f2662922e90..c678c84f22c 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -123,7 +123,7 @@ class TodoService
def handle_note(note, author)
# Skip system notes, and notes on project snippet
- return if note.system? || note.for_project_snippet?
+ return if note.system? || note.for_snippet?
project = note.project
target = note.noteable
diff --git a/lib/gitlab/note_data_builder.rb b/lib/gitlab/note_data_builder.rb
index 71cf6a0d886..18523e0aefe 100644
--- a/lib/gitlab/note_data_builder.rb
+++ b/lib/gitlab/note_data_builder.rb
@@ -41,7 +41,7 @@ module Gitlab
data[:issue] = note.noteable.hook_attrs
elsif note.for_merge_request?
data[:merge_request] = note.noteable.hook_attrs
- elsif note.for_project_snippet?
+ elsif note.for_snippet?
data[:snippet] = note.noteable.hook_attrs
end
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index 6f0d02cafd1..7486510a4af 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -46,7 +46,7 @@ module Gitlab
merge_request = MergeRequest.find(note.noteable_id)
merge_request_url(merge_request,
anchor: "note_#{note.id}")
- elsif note.for_project_snippet?
+ elsif note.for_snippet?
snippet = Snippet.find(note.noteable_id)
project_snippet_url(snippet,
anchor: "note_#{note.id}")