diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
| commit | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch) | |
| tree | 165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /app/models | |
| parent | 51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/hooks/project_hook.rb | 2 | ||||
| -rw-r--r-- | app/models/user_callout_enums.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index a5f68831f34..bc480b14e67 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -21,7 +21,7 @@ class ProjectHook < WebHook validates :project, presence: true def pluralized_name - _('Project Hooks') + _('Webhooks') end end diff --git a/app/models/user_callout_enums.rb b/app/models/user_callout_enums.rb index ef0b2407e23..625cbb4fe5f 100644 --- a/app/models/user_callout_enums.rb +++ b/app/models/user_callout_enums.rb @@ -15,7 +15,8 @@ module UserCalloutEnums gcp_signup_offer: 2, cluster_security_warning: 3, suggest_popover_dismissed: 9, - tabs_position_highlight: 10 + tabs_position_highlight: 10, + webhooks_moved: 13 } end end |