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

Rename Event#note_commit? to commit_note?

Browse Source
This commit is contained in:
Robert Speicher
2016-05-16 14:52:03 -05:00
parent 8a7b5b17d3
commit b2fc0a51a6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/events_helper.rb
+5 -5
View File
@@ -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,
app/models/event.rb
+2 -2
View File
@@ -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