kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'patch-32' into 'master' 

Fix typo in scheduled pipelines

See merge request gitlab-org/gitlab-ce!23218
This commit is contained in:
Grzegorz Bizon 2018-11-22 08:38:05 +00:00
parent 9a1952bf60 6353a45b30
commit 0e1822801a
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/mr-origin-23218.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix typo for scheduled pipeline
merge_request: 23218
author: Davy Defaud
type: other

2
lib/gitlab/ci/status/build/scheduled.rb
View File

@ -10,7 +10,7 @@ module Gitlab
image: 'illustrations/illustrations_scheduled-job_countdown.svg',
size: 'svg-394',
title: _("This is a delayed job to run in %{remainingTime}"),
content: _("This job will automatically run after it's timer finishes. " \
content: _("This job will automatically run after its timer finishes. " \
"Often they are used for incremental roll-out deploys " \
"to production environments. When unscheduled it converts " \
"into a manual action.")

2
locale/gitlab.pot
View File

@ -6446,7 +6446,7 @@ msgstr ""
msgid "This job requires a manual action"
msgstr ""
msgid "This job will automatically run after it's timer finishes. Often they are used for incremental roll-out deploys to production environments. When unscheduled it converts into a manual action."
msgid "This job will automatically run after its timer finishes. Often they are used for incremental roll-out deploys to production environments. When unscheduled it converts into a manual action."
msgstr ""
msgid "This means you can not push code until you create an empty repository or import existing one."

2
spec/features/projects/jobs_spec.rb
View File

@ -596,7 +596,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it 'shows delayed job', :js do
expect(page).to have_content('This is a delayed job to run in')
expect(page).to have_content("This job will automatically run after it's timer finishes.")
expect(page).to have_content("This job will automatically run after its timer finishes.")
expect(page).to have_link('Unschedule job')
end