diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 15:41:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 15:41:52 +0300 |
| commit | b39ba6a9d46f041f6cff845d3a4a3834ac873869 (patch) | |
| tree | 2eb22ce64d4eea81baf6b51fe3ff330d4bdd63a0 /app/models | |
| parent | ab5ec2e047ff0942db3aab555926bdd07c051087 (diff) | |
Add latest changes from gitlab-org/security/gitlab@14-3-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0ba97138a25..f68fdadf51b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -438,8 +438,8 @@ class Project < ApplicationRecord :container_registry_access_level, :container_registry_enabled?, to: :project_feature, allow_nil: true alias_method :container_registry_enabled, :container_registry_enabled? - delegate :show_default_award_emojis, :show_default_award_emojis=, - :show_default_award_emojis?, + delegate :show_default_award_emojis, :show_default_award_emojis=, :show_default_award_emojis?, + :warn_about_potentially_unwanted_characters, :warn_about_potentially_unwanted_characters=, :warn_about_potentially_unwanted_characters?, to: :project_setting, allow_nil: true delegate :scheduled?, :started?, :in_progress?, :failed?, :finished?, prefix: :import, to: :import_state, allow_nil: true |