diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 18:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 18:08:49 +0000 |
| commit | 1ca6880aac4a41fe2ae519a87ebfb90470fad7c5 (patch) | |
| tree | f01c6ed81a6850f23ee1eb64f09044ce2b57aeba /app/models/snippet.rb | |
| parent | 4d922922a97e5ac6a1617aba00642ad7657d2727 (diff) | |
| download | gitlab-ce-1ca6880aac4a41fe2ae519a87ebfb90470fad7c5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/snippet.rb')
| -rw-r--r-- | app/models/snippet.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 1cf3097861c..7d2229140b8 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -19,7 +19,6 @@ class Snippet < ApplicationRecord extend ::Gitlab::Utils::Override MAX_FILE_COUNT = 10 - MAX_SINGLE_FILE_COUNT = 1 cache_markdown_field :title, pipeline: :single_line cache_markdown_field :description @@ -175,8 +174,8 @@ class Snippet < ApplicationRecord Snippet.find_by(id: id, project: project) end - def self.max_file_limit(user) - Feature.enabled?(:snippet_multiple_files, user) ? MAX_FILE_COUNT : MAX_SINGLE_FILE_COUNT + def self.max_file_limit + MAX_FILE_COUNT end def initialize(attributes = {}) |