diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 12:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 12:07:59 +0300 |
| commit | a325f3a104748ecc68df7c3d793940aa709a111f (patch) | |
| tree | b3bce12be64ab2d9e31627dacd059165819797a3 /app | |
| parent | 8fb943c7df5f2b399caaeaebd6c00d0630bc763c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user_bot_type_enums.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user_bot_type_enums.rb b/app/models/user_bot_type_enums.rb index b6b08ce650b..e4b1751b072 100644 --- a/app/models/user_bot_type_enums.rb +++ b/app/models/user_bot_type_enums.rb @@ -2,7 +2,7 @@ module UserBotTypeEnums def self.bots - # When adding a new key, please ensure you are not conflicting with EE-only keys in app/models/user_bot_types_enums.rb + # When adding a new key, please ensure you are not conflicting with EE-only keys in app/models/user_bot_type_enums.rb { alert_bot: 2 } |