diff options
author | Robert Speicher <robert@gitlab.com> | 2016-04-19 19:21:50 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-04-19 19:21:50 +0000 |
commit | 6a19467c415487ae786df12b04f62647132986ac (patch) | |
tree | c31019e807dd09fbdcd8c5b88cfceabe14097e8c /app/models/issue.rb | |
parent | f1e778be48c36fb26670325e61acb4ed12785b7d (diff) | |
parent | 6970612bcc5b9a74c00abea129a8afc7cbe681bb (diff) | |
download | gitlab-ce-6a19467c415487ae786df12b04f62647132986ac.tar.gz |
Merge branch '15139-fix-constants-redefinition-warnings' into 'master'
Define constants only if not defined yet and freeze them
Fixes #15139.
See merge request !3810
Diffstat (limited to 'app/models/issue.rb')
-rw-r--r-- | app/models/issue.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 2f773869603..a009e235b37 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -20,7 +20,6 @@ # require 'carrierwave/orm/activerecord' -require 'file_size_validator' class Issue < ActiveRecord::Base include InternalId |