diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 12:06:20 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 12:06:20 +0100 |
| commit | 3da32ef7d84f5800434379520878fe5c186b9e39 (patch) | |
| tree | 3095a89ae3a75fca29f3be1b5d2a3d41824a81e1 /app/models/commit.rb | |
| parent | 113325a9e02b06d9cef82b913e2ab6f33331371b (diff) | |
| parent | 234f4bf20fb338f2164976fd39203fbc671afd29 (diff) | |
| download | gitlab-ce-3da32ef7d84f5800434379520878fe5c186b9e39.tar.gz | |
Merge branch 'master' into rake-tasks-git
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 492f6be1ce3..c0998a45709 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -78,11 +78,23 @@ class Commit }x end + def self.link_reference_pattern + super("commit", /(?<commit>\h{6,40})/) + end + def to_reference(from_project = nil) if cross_project_reference?(from_project) - "#{project.to_reference}@#{id}" + project.to_reference + self.class.reference_prefix + self.id + else + self.id + end + end + + def reference_link_text(from_project = nil) + if cross_project_reference?(from_project) + project.to_reference + self.class.reference_prefix + self.short_id else - id + self.short_id end end |