From b2fc0a51a61669b46516c2a21cbd0abd893ff124 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 12 May 2016 15:31:53 -0500
Subject: [PATCH] Rename `Event#note_commit?` to `commit_note?`
---
app/helpers/events_helper.rb | 10 +++++-----
app/models/event.rb | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d0a63d58803..d7ddb31dbb7 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -57,7 +57,7 @@ module EventsHelper
words << event.ref_name
words << "at"
elsif event.commented?
- if event.note_commit?
+ if event.commit_note?
words << event.note_short_commit_id
else
words << "##{truncate event.note_target_iid}"
@@ -84,12 +84,12 @@ module EventsHelper
elsif event.merge_request?
namespace_project_merge_request_url(event.project.namespace,
event.project, event.merge_request)
- elsif event.note? && event.note_commit?
+ elsif event.note? && event.commit_note?
namespace_project_commit_url(event.project.namespace, event.project,
event.note_target)
elsif event.note?
if event.note_target
- if event.note_commit?
+ if event.commit_note?
namespace_project_commit_path(event.project.namespace, event.project,
event.note_commit_id,
anchor: dom_id(event.target))
@@ -134,7 +134,7 @@ module EventsHelper
end
def event_note_target_path(event)
- if event.note? && event.note_commit?
+ if event.note? && event.commit_note?
namespace_project_commit_path(event.project.namespace, event.project,
event.note_target)
else
@@ -146,7 +146,7 @@ module EventsHelper
def event_note_title_html(event)
if event.note_target
- if event.note_commit?
+ if event.commit_note?
link_to(
namespace_project_commit_path(event.project.namespace, event.project,
event.note_commit_id,
diff --git a/app/models/event.rb b/app/models/event.rb
index a617694b7dd..5629f1ee445 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -278,7 +278,7 @@ class Event < ActiveRecord::Base
Commit.truncate_sha(note_commit_id)
end
- def note_commit?
+ def commit_note?
target.for_commit?
end
@@ -295,7 +295,7 @@ class Event < ActiveRecord::Base
end
def note_target_id
- if note_commit?
+ if commit_note?
target.commit_id
else
target.noteable_id.to_s
--
GitLab