diff options
| author | Davy Defaud <davy.defaud@free.fr> | 2018-11-22 08:38:05 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-22 08:38:05 +0000 |
| commit | 6353a45b3036feb62eecbbec954dd3b07a5748d0 (patch) | |
| tree | 1c53fbaadac5c3f49536478cedd77bfb5b87667a | |
| parent | 9a1952bf6019ef152939eb1a63e12b3aa595c793 (diff) | |
| download | gitlab-ce-6353a45b3036feb62eecbbec954dd3b07a5748d0.tar.gz | |
Fix typo in scheduled pipelines
| -rw-r--r-- | changelogs/unreleased/mr-origin-23218.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/status/build/scheduled.rb | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 | ||||
| -rw-r--r-- | spec/features/projects/jobs_spec.rb | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/mr-origin-23218.yml b/changelogs/unreleased/mr-origin-23218.yml new file mode 100644 index 00000000000..49867f04343 --- /dev/null +++ b/changelogs/unreleased/mr-origin-23218.yml @@ -0,0 +1,5 @@ +--- +title: Fix typo for scheduled pipeline +merge_request: 23218 +author: Davy Defaud +type: other diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb index b3452eae189..0a09dbe5f42 100644 --- a/lib/gitlab/ci/status/build/scheduled.rb +++ b/lib/gitlab/ci/status/build/scheduled.rb @@ -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.") diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 15d18e6691f..7af36b049d8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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." diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 99a7fbb63bd..24352be592a 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -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 |