diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-18 10:32:22 -0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-18 11:07:30 -0300 |
commit | 231d4fb9f8a30e97fd9bcb7176ad8337557f6ea0 (patch) | |
tree | 5604a66607d0d0e888d7854b1d75af474bce15cb | |
parent | 2eeeb266e36abdbe78be8f71081bb19e83175819 (diff) | |
download | gitlab-ce-231d4fb9f8a30e97fd9bcb7176ad8337557f6ea0.tar.gz |
Use `Commit#short_id` instead of `Commit.truncate_sha`
-rw-r--r-- | app/models/todo.rb | 2 | ||||
-rw-r--r-- | spec/models/todo_spec.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/models/todo.rb b/app/models/todo.rb index 4be5806b8d1..b135407a8ee 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -73,7 +73,7 @@ class Todo < ActiveRecord::Base def to_reference if for_commit? - Commit.truncate_sha(commit_id) + target.short_id else target.to_reference end diff --git a/spec/models/todo_spec.rb b/spec/models/todo_spec.rb index ad744216421..0fbd36f3a22 100644 --- a/spec/models/todo_spec.rb +++ b/spec/models/todo_spec.rb @@ -117,9 +117,11 @@ describe Todo, models: true do describe '#to_reference' do it 'returns the short commit id for commits' do + subject.project = project subject.target_type = 'Commit' subject.commit_id = commit.id - expect(subject.to_reference).to eq Commit.truncate_sha(commit.id) + + expect(subject.to_reference).to eq commit.short_id end it 'returns reference for issuables' do |