From 091b8a6ede2515bb555ec8662b9d933d70bda3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 31 Mar 2016 09:20:27 +0200 Subject: Rename Note#for_project_snippet? to #for_snippet? MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- app/models/note.rb | 2 +- app/services/todo_service.rb | 2 +- lib/gitlab/note_data_builder.rb | 2 +- lib/gitlab/url_builder.rb | 2 +- 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}") -- cgit v1.2.1