Commit 0e182280 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'patch-32' into 'master'

Fix typo in scheduled pipelines

See merge request gitlab-org/gitlab-ce!23218
parents 9a1952bf 6353a45b
---
title: Fix typo for scheduled pipeline
merge_request: 23218
author: Davy Defaud
type: other
...@@ -10,7 +10,7 @@ module Gitlab ...@@ -10,7 +10,7 @@ module Gitlab
image: 'illustrations/illustrations_scheduled-job_countdown.svg', image: 'illustrations/illustrations_scheduled-job_countdown.svg',
size: 'svg-394', size: 'svg-394',
title: _("This is a delayed job to run in %{remainingTime}"), 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 " \ "Often they are used for incremental roll-out deploys " \
"to production environments. When unscheduled it converts " \ "to production environments. When unscheduled it converts " \
"into a manual action.") "into a manual action.")
......
...@@ -6446,7 +6446,7 @@ msgstr "" ...@@ -6446,7 +6446,7 @@ msgstr ""
msgid "This job requires a manual action" msgid "This job requires a manual action"
msgstr "" 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 "" msgstr ""
msgid "This means you can not push code until you create an empty repository or import existing one." msgid "This means you can not push code until you create an empty repository or import existing one."
......
...@@ -596,7 +596,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -596,7 +596,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it 'shows delayed job', :js 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 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') expect(page).to have_link('Unschedule job')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment