diff options
author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 19:03:27 +0000 |
---|---|---|
committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 19:03:27 +0000 |
commit | b8485707f268e95b28ef051cc5a4250df22cd13b (patch) | |
tree | 882a11d3ac70c1eb3762ce8ee55866fdef438640 /app/models/concerns/referable.rb | |
parent | ab6bf68c4ed62a487fa7e6390462c32bf836c8d6 (diff) | |
parent | f0ac0daf6a8788f57b98eaf29b0056899027ae68 (diff) | |
download | gitlab-ce-b8485707f268e95b28ef051cc5a4250df22cd13b.tar.gz |
Fix conflictdocs-article-undo-things-in-git
Merge branch 'master' into 'docs-article-undo-things-in-git'
# Conflicts:
# doc/articles/index.md
Diffstat (limited to 'app/models/concerns/referable.rb')
-rw-r--r-- | app/models/concerns/referable.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/models/concerns/referable.rb b/app/models/concerns/referable.rb index 10f4be72016..78ac4f324e7 100644 --- a/app/models/concerns/referable.rb +++ b/app/models/concerns/referable.rb @@ -25,6 +25,11 @@ module Referable to_reference(from_project) end + included do + alias_method :non_referable_inspect, :inspect + alias_method :inspect, :referable_inspect + end + def referable_inspect if respond_to?(:id) "#<#{self.class.name} id:#{id} #{to_reference(full: true)}>" @@ -33,10 +38,6 @@ module Referable end end - def inspect - referable_inspect - end - module ClassMethods # The character that prefixes the actual reference identifier # |