kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Get rid of more requires, which causes warnings when code is reloaded

Browse source 
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2016-04-19 11:48:10 +02:00
parent 1fbea7cec9
commit 6970612bcc
No known key found for this signature in database
GPG key ID: 46DF07E5CD9E96AB
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/commit.rb
View file

@ -12,11 +12,11 @@ class Commit
attr_accessor :project
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
DIFF_HARD_LIMIT_FILES ||= 1000
DIFF_HARD_LIMIT_LINES ||= 50000
DIFF_HARD_LIMIT_FILES = 1000
DIFF_HARD_LIMIT_LINES = 50000
class << self
def decorate(commits, project)

3
app/models/merge_request.rb
View file

@ -27,9 +27,6 @@
# merge_commit_sha :string
#
require Rails.root.join("app/models/commit")
require Rails.root.join("lib/static_model")
class MergeRequest < ActiveRecord::Base
include InternalId
include Issuable

2
app/models/merge_request_diff.rb
View file

@ -11,8 +11,6 @@
# updated_at :datetime
#
require Rails.root.join("app/models/commit")
class MergeRequestDiff < ActiveRecord::Base
include Sortable

8
lib/file_size_validator.rb
View file

@ -1,9 +1,9 @@
class FileSizeValidator < ActiveModel::EachValidator
MESSAGES ||= { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
CHECKS ||= { is: :==, minimum: :>=, maximum: :<= }.freeze
MESSAGES = { is: :wrong_size, minimum: :size_too_small, maximum: :size_too_big }.freeze
CHECKS = { is: :==, minimum: :>=, maximum: :<= }.freeze
DEFAULT_TOKENIZER ||= -> (value) { value.split(//) }.freeze
RESERVED_OPTIONS ||= [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long].freeze
DEFAULT_TOKENIZER = -> (value) { value.split(//) }.freeze
RESERVED_OPTIONS = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long].freeze
def initialize(options)
if range = (options.delete(:in) || options.delete(:within))