diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-13 06:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-13 06:09:46 +0300 |
| commit | 5dd05f8e992833b6d780e6bf4c06ae9b5d49ec3b (patch) | |
| tree | 98c91b025d31d0379baf70b9d67ef4b354ac0e9e /app | |
| parent | 41038b07f78339fb0a02a6917dbeeabf19f47697 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/workers/all_queues.yml | 9 | ||||
| -rw-r--r-- | app/workers/gitlab_usage_ping_worker.rb | 4 |
3 files changed, 1 insertions, 14 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6b7bf7fa822..80b8c9173d1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2106,7 +2106,7 @@ class User < ApplicationRecord end def check_username_format - return if username.blank? || Mime::EXTENSION_LOOKUP.keys.none? { |type| username.end_with?(type) } + return if username.blank? || Mime::EXTENSION_LOOKUP.keys.none? { |type| username.end_with?(".#{type}") } errors.add(:username, _('ending with MIME type format is not allowed.')) end diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 26afe36893a..04c557965b1 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -274,15 +274,6 @@ :weight: 1 :idempotent: :tags: [] -- :name: cronjob:gitlab_usage_ping - :worker_name: GitlabUsagePingWorker - :feature_category: :service_ping - :has_external_dependencies: - :urgency: :low - :resource_boundary: :unknown - :weight: 1 - :idempotent: - :tags: [] - :name: cronjob:import_export_project_cleanup :worker_name: ImportExportProjectCleanupWorker :feature_category: :importers diff --git a/app/workers/gitlab_usage_ping_worker.rb b/app/workers/gitlab_usage_ping_worker.rb deleted file mode 100644 index 5dbd2272e07..00000000000 --- a/app/workers/gitlab_usage_ping_worker.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class GitlabUsagePingWorker < GitlabServicePingWorker # rubocop:disable Scalability/IdempotentWorker -end |