From 3e2113a2dff065887e9db66491cbe6c074a0ccf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryx=C3=AD?= Date: Sun, 1 Dec 2019 19:50:09 +0000 Subject: [PATCH 1/3] Update ee/app/views/projects/settings/ci_cd/_pipeline_subscriptions.html.haml --- .../projects/settings/ci_cd/_pipeline_subscriptions.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/app/views/projects/settings/ci_cd/_pipeline_subscriptions.html.haml b/ee/app/views/projects/settings/ci_cd/_pipeline_subscriptions.html.haml index 1c25354ea9e807..70611d824c87f0 100644 --- a/ee/app/views/projects/settings/ci_cd/_pipeline_subscriptions.html.haml +++ b/ee/app/views/projects/settings/ci_cd/_pipeline_subscriptions.html.haml @@ -10,7 +10,7 @@ = _("Set up pipeline subscriptions for this project.") %p - default_branch_docs = link_to(_("default branch"), help_page_path('user/project/repository/branches', anchor: 'default-branch')) - = _("Subscriptions allow successfully completed pipelines on the %{default_branch_docs} of the subscribed project to trigger a new pipeline on thee default branch of this project.").html_safe % { default_branch_docs: default_branch_docs } + = _("Subscriptions allow successfully completed pipelines on the %{default_branch_docs} of the subscribed project to trigger a new pipeline on the default branch of this project.").html_safe % { default_branch_docs: default_branch_docs } %p = _("There is a limit of 100 subscriptions from or to a project.") -- GitLab From c5cd11c57268d5e50a28901ec2f733a2ff799651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryx=C3=AD?= Date: Sun, 1 Dec 2019 19:53:34 +0000 Subject: [PATCH 2/3] fix: minor typo --- locale/gitlab.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bd3aca61343a7a..e31f1caadfe35c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -16833,7 +16833,7 @@ msgstr "" msgid "Subscriptions" msgstr "" -msgid "Subscriptions allow successfully completed pipelines on the %{default_branch_docs} of the subscribed project to trigger a new pipeline on thee default branch of this project." +msgid "Subscriptions allow successfully completed pipelines on the %{default_branch_docs} of the subscribed project to trigger a new pipeline on the default branch of this project." msgstr "" msgid "Subtracted" -- GitLab From 948b30d379c3704eb89216e834e1d89259bf7fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryxi=CC=81?= Date: Sun, 1 Dec 2019 21:32:26 +0100 Subject: [PATCH 3/3] docs: add changelog --- changelogs/unreleased/21003-minor-typo-thee.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/21003-minor-typo-thee.yml diff --git a/changelogs/unreleased/21003-minor-typo-thee.yml b/changelogs/unreleased/21003-minor-typo-thee.yml new file mode 100644 index 00000000000000..cd0e0ca309b82e --- /dev/null +++ b/changelogs/unreleased/21003-minor-typo-thee.yml @@ -0,0 +1,5 @@ +--- +title: Fix minor typo in functionality description. +merge_request: 21003 +author: michal.bryxi +type: fixed -- GitLab