Commit 6a19467c authored by Robert Speicher's avatar Robert Speicher

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
parents f1e778be 6970612b
...@@ -15,8 +15,8 @@ class Commit ...@@ -15,8 +15,8 @@ class Commit
DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines] DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines]
# Commits above this size will not be rendered in HTML # Commits above this size will not be rendered in HTML
DIFF_HARD_LIMIT_FILES = 1000 unless defined?(DIFF_HARD_LIMIT_FILES) DIFF_HARD_LIMIT_FILES = 1000
DIFF_HARD_LIMIT_LINES = 50000 unless defined?(DIFF_HARD_LIMIT_LINES) DIFF_HARD_LIMIT_LINES = 50000
class << self class << self
def decorate(commits, project) def decorate(commits, project)
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
# #
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class Group < Namespace class Group < Namespace
include Gitlab::ConfigHelper include Gitlab::ConfigHelper
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
# #
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class Issue < ActiveRecord::Base class Issue < ActiveRecord::Base
include InternalId include InternalId
......
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
# merge_commit_sha :string # merge_commit_sha :string
# #
require Rails.root.join("app/models/commit")
require Rails.root.join("lib/static_model")
class MergeRequest < ActiveRecord::Base class MergeRequest < ActiveRecord::Base
include InternalId include InternalId
include Issuable include Issuable
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
# updated_at :datetime # updated_at :datetime
# #
require Rails.root.join("app/models/commit")
class MergeRequestDiff < ActiveRecord::Base class MergeRequestDiff < ActiveRecord::Base
include Sortable include Sortable
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
# #
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class Note < ActiveRecord::Base class Note < ActiveRecord::Base
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
# #
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class Project < ActiveRecord::Base class Project < ActiveRecord::Base
include Gitlab::ConfigHelper include Gitlab::ConfigHelper
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
# #
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class ProjectImportData < ActiveRecord::Base class ProjectImportData < ActiveRecord::Base
belongs_to :project belongs_to :project
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
# #
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class User < ActiveRecord::Base class User < ActiveRecord::Base
extend Gitlab::ConfigHelper extend Gitlab::ConfigHelper
......
class FileSizeValidator < ActiveModel::EachValidator class FileSizeValidator < ActiveModel::EachValidator
MESSAGES = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze MESSAGES = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
CHECKS = { is: :==, minimum: :>=, maximum: :<= }.freeze CHECKS = { is: :==, minimum: :>=, maximum: :<= }.freeze
DEFAULT_TOKENIZER = lambda { |value| value.split(//) } DEFAULT_TOKENIZER = -> (value) { value.split(//) }.freeze
RESERVED_OPTIONS = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long] RESERVED_OPTIONS = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long].freeze
def initialize(options) def initialize(options)
if range = (options.delete(:in) || options.delete(:within)) if range = (options.delete(:in) || options.delete(:within))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment