summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 11:20:51 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 11:20:51 +0100
commit2955ca613bfe13cd15c43d082be934075636ae0e (patch)
tree4c367f600ff0b7f273c3b4194e97060141b54b02 /app/models/project.rb
parente1e67d383e4b56c9e1848aebc175402a71502e82 (diff)
parent09e712c0fb721059e4b2619eb9fc104257fc492d (diff)
downloadgitlab-ce-2955ca613bfe13cd15c43d082be934075636ae0e.tar.gz
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 2cf0bb1f077..96f6d7b5e26 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -42,9 +42,8 @@ class Project < ActiveRecord::Base
include Sortable
include AfterCommitQueue
include CaseSensitivity
-
+
extend Gitlab::ConfigHelper
- extend Enumerize
UNKNOWN_IMPORT_URL = 'http://unknown.git'