diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-14 15:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-14 15:09:48 +0300 |
| commit | 7f73b108d44ebb58d2eddcbc98808bafc94d1b11 (patch) | |
| tree | c44c1d67aefe3a48ce24b1b83ce495edbf57ff25 /app/controllers | |
| parent | 8f55aaede8e1ba5ca9ffae53313fa860ad05bffa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/help_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/import/bitbucket_server_controller.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 9635e476510..df8128f24fe 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -9,7 +9,7 @@ class HelpController < ApplicationController # Taken from Jekyll # https://github.com/jekyll/jekyll/blob/3.5-stable/lib/jekyll/document.rb#L13 - YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze + YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m def index @help_index = get_markdown_without_frontmatter(path_to_doc('index.md')) diff --git a/app/controllers/import/bitbucket_server_controller.rb b/app/controllers/import/bitbucket_server_controller.rb index e17cd00d053..ba2743e1002 100644 --- a/app/controllers/import/bitbucket_server_controller.rb +++ b/app/controllers/import/bitbucket_server_controller.rb @@ -22,8 +22,8 @@ class Import::BitbucketServerController < Import::BaseController # (https://community.atlassian.com/t5/Answers-Developer-Questions/stash-repository-names/qaq-p/499054) # # Bitbucket Server starts personal project names with a tilde. - VALID_BITBUCKET_PROJECT_CHARS = /\A~?[\w\-\.\s]+\z/.freeze - VALID_BITBUCKET_CHARS = /\A[\w\-\.\s]+\z/.freeze + VALID_BITBUCKET_PROJECT_CHARS = /\A~?[\w\-\.\s]+\z/ + VALID_BITBUCKET_CHARS = /\A[\w\-\.\s]+\z/ def new end |