Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-22 00:08:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-22 00:08:34 +0300
commit4c344d3be4b52751778ae896d2f9b19a6135540b (patch)
tree078fcb1806d28e9516e5cc1bc8927cb46c3cccc7 /app/helpers
parenta8f6ebb4d6511962eaff1181896a289675cb73ba (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/services_helper.rb26
1 files changed, 15 insertions, 11 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index a9d70522d9b..13d26166e6e 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -4,25 +4,29 @@ module ServicesHelper
def service_event_description(event)
case event
when "push", "push_events"
- "Event will be triggered by a push to the repository"
+ s_("ProjectService|Event will be triggered by a push to the repository")
when "tag_push", "tag_push_events"
- "Event will be triggered when a new tag is pushed to the repository"
+ s_("ProjectService|Event will be triggered when a new tag is pushed to the repository")
when "note", "note_events"
- "Event will be triggered when someone adds a comment"
+ s_("ProjectService|Event will be triggered when someone adds a comment")
when "confidential_note", "confidential_note_events"
- "Event will be triggered when someone adds a comment on a confidential issue"
+ s_("ProjectService|Event will be triggered when someone adds a comment on a confidential issue")
when "issue", "issue_events"
- "Event will be triggered when an issue is created/updated/closed"
- when "confidential_issue", "confidential_issues_events"
- "Event will be triggered when a confidential issue is created/updated/closed"
+ s_("ProjectService|Event will be triggered when an issue is created/updated/closed")
+ when "confidential_issue", "confidential_issue_events"
+ s_("ProjectService|Event will be triggered when a confidential issue is created/updated/closed")
when "merge_request", "merge_request_events"
- "Event will be triggered when a merge request is created/updated/merged"
+ s_("ProjectService|Event will be triggered when a merge request is created/updated/merged")
when "pipeline", "pipeline_events"
- "Event will be triggered when a pipeline status changes"
+ s_("ProjectService|Event will be triggered when a pipeline status changes")
when "wiki_page", "wiki_page_events"
- "Event will be triggered when a wiki page is created/updated"
+ s_("ProjectService|Event will be triggered when a wiki page is created/updated")
when "commit", "commit_events"
- "Event will be triggered when a commit is created/updated"
+ s_("ProjectService|Event will be triggered when a commit is created/updated")
+ when "deployment"
+ s_("ProjectService|Event will be triggered when a deployment finishes")
+ when "alert"
+ s_("ProjectService|Event will be triggered when a new, unique alert is recorded")
end
end