summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2017-12-13 15:16:36 +0100
committerMatija Čupić <matteeyah@gmail.com>2017-12-13 15:16:36 +0100
commitcc9b6091d193f7255aaf90983a2fbeda02061875 (patch)
tree138d809a90ac5f93af0de4fab3762b2d5b1d2746 /app/models/commit.rb
parenteb9f88311b0591586c73ddb35bdb07677464748c (diff)
parentb305a1331c14f819914ef1230bdf184860475045 (diff)
downloadgitlab-ce-cc9b6091d193f7255aaf90983a2fbeda02061875.tar.gz
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 6b28d290f99..307e4fcedfe 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
class Commit
extend ActiveModel::Naming
extend Gitlab::Cache::RequestCache
@@ -25,7 +26,7 @@ class Commit
DIFF_HARD_LIMIT_FILES = 1000
DIFF_HARD_LIMIT_LINES = 50000
- MIN_SHA_LENGTH = 7
+ MIN_SHA_LENGTH = Gitlab::Git::Commit::MIN_SHA_LENGTH
COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze
def banzai_render_context(field)