summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-11-25 17:06:04 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-11-25 17:06:04 -0500
commit5f0d1f30b0f0e31d31a2eb0db9f92776bf551f26 (patch)
tree8e8ace998a59375ee3b6502e3a9a768e4cd648cb
parentdee28c50a90acaf1a364d3971132c70c96493932 (diff)
downloadgitlab-ce-5f0d1f30b0f0e31d31a2eb0db9f92776bf551f26.tar.gz
Remove enumerize gemrs-remove-enumerize
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock3
-rw-r--r--app/models/project.rb3
3 files changed, 1 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 4762e2e223f..1beeabd44d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,9 +62,6 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# based on human-friendly examples
gem "stamp", '~> 0.6.0'
-# Enumeration fields
-gem 'enumerize', '~> 0.7.0'
-
# Pagination
gem "kaminari", "~> 0.16.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 46247dd88e2..ef083754f0f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,8 +173,6 @@ GEM
launchy (~> 2.1)
mail (~> 2.2)
encryptor (1.3.0)
- enumerize (0.7.0)
- activesupport (>= 3.2)
equalizer (0.0.11)
erubis (2.7.0)
escape_utils (1.1.0)
@@ -828,7 +826,6 @@ DEPENDENCIES
dropzonejs-rails (~> 0.7.1)
email_reply_parser (~> 0.5.8)
email_spec (~> 1.6.0)
- enumerize (~> 0.7.0)
factory_girl_rails (~> 4.3.0)
ffaker (~> 2.0.0)
flay
diff --git a/app/models/project.rb b/app/models/project.rb
index f0a4b6aae7b..6010770a5f2 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'