diff options
author | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
commit | d4b2f4dd8332701c2df0003a213b34abe0163599 (patch) | |
tree | ec868cb769c6656bbcb4b42b65710ab72717598e /app/models/commit.rb | |
parent | 5348985015cd0f3163ed7617eb86df63396db16b (diff) | |
parent | 112f9710b65fe830a058366cde1734a2928764de (diff) | |
download | gitlab-ce-pipeline_index_vue_error_state.tar.gz |
Merge branch 'master' into pipeline_index_vue_error_statepipeline_index_vue_error_state
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 5d942cb0422..316bd2e512b 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -21,6 +21,9 @@ class Commit DIFF_HARD_LIMIT_FILES = 1000 DIFF_HARD_LIMIT_LINES = 50000 + # The SHA can be between 7 and 40 hex characters. + COMMIT_SHA_PATTERN = '\h{7,40}' + class << self def decorate(commits, project) commits.map do |commit| @@ -52,6 +55,10 @@ class Commit def from_hash(hash, project) new(Gitlab::Git::Commit.new(hash), project) end + + def valid_hash?(key) + !!(/\A#{COMMIT_SHA_PATTERN}\z/ =~ key) + end end attr_accessor :raw @@ -77,8 +84,6 @@ class Commit # Pattern used to extract commit references from text # - # The SHA can be between 7 and 40 hex characters. - # # This pattern supports cross-project references. def self.reference_pattern @reference_pattern ||= %r{ @@ -88,7 +93,7 @@ class Commit end def self.link_reference_pattern - @link_reference_pattern ||= super("commit", /(?<commit>\h{7,40})/) + @link_reference_pattern ||= super("commit", /(?<commit>#{COMMIT_SHA_PATTERN})/) end def to_reference(from_project = nil, full: false) |