diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 21:07:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 21:07:42 +0300 |
commit | 7b52c7cb634ef7047d30b0337fe477bcdcedf41d (patch) | |
tree | 374ca9e908204488422046f10e340d1500780362 /app/models/wiki_page.rb | |
parent | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/wiki_page.rb')
-rw-r--r-- | app/models/wiki_page.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 26beb77a025..c5db42a40ac 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -333,11 +333,15 @@ class WikiPage *dirnames, title = @attributes[:title].split('/') if title.bytesize > MAX_TITLE_BYTES - errors.add(:title, _("exceeds the limit of %{bytes} bytes for page titles") % { bytes: MAX_TITLE_BYTES }) + errors.add(:title, _("exceeds the limit of %{bytes} bytes") % { bytes: MAX_TITLE_BYTES }) end - if dirnames.any? { |d| d.bytesize > MAX_DIRECTORY_BYTES } - errors.add(:title, _("exceeds the limit of %{bytes} bytes for directory names") % { bytes: MAX_DIRECTORY_BYTES }) + invalid_dirnames = dirnames.select { |d| d.bytesize > MAX_DIRECTORY_BYTES } + invalid_dirnames.each do |dirname| + errors.add(:title, _('exceeds the limit of %{bytes} bytes for directory name "%{dirname}"') % { + bytes: MAX_DIRECTORY_BYTES, + dirname: dirname + }) end end end |