summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-04 20:06:29 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-04-04 20:06:29 -0500
commit51b8b8711b51ac48fe5aea9f6282e9b75b83e65b (patch)
tree1c5683a9d48337960b5f92b9c643ad211f006ff6 /app/models/commit.rb
parent824fecb728ae7534b8ef56aaa6679814f3924cd5 (diff)
parent67136007933425414293602bc75d2ba4822f2a93 (diff)
downloadgitlab-ce-51b8b8711b51ac48fe5aea9f6282e9b75b83e65b.tar.gz
Merge branch 'master' into issue_14800
# Conflicts: # app/assets/stylesheets/framework/variables.scss
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index d0dbe009d0d..d09876a07d9 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -74,14 +74,14 @@ class Commit
#
# This pattern supports cross-project references.
def self.reference_pattern
- %r{
+ @reference_pattern ||= %r{
(?:#{Project.reference_pattern}#{reference_prefix})?
(?<commit>\h{7,40})
}x
end
def self.link_reference_pattern
- super("commit", /(?<commit>\h{7,40})/)
+ @link_reference_pattern ||= super("commit", /(?<commit>\h{7,40})/)
end
def to_reference(from_project = nil)