Commit eb10fa5c authored by Phil Hughes's avatar Phil Hughes

Merge branch '18678-fe-subsc' into 'master'

Adds subscription section

See merge request gitlab-org/gitlab!18943
parents 43197387 63b887e4
......@@ -55,6 +55,7 @@
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _("Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions.")
= _("Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions.")
.settings-content
= render 'projects/triggers/index'
- expanded = expanded_by_default?
%section.settings.no-animate#pipeline-subscriptions{ class: ('expanded' if expanded) }
.settings-header
%h4
= _("Pipeline subscriptions")
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _("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 }
%p
= _("There is a limit of 100 subscriptions from or to a project.")
.settings-content
= render 'projects/settings/subscriptions/index'
= render_ce 'projects/settings/ci_cd/show'
= render 'projects/settings/ci_cd/managed_licenses'
= render 'projects/settings/ci_cd/pipeline_subscriptions'
.row.prepend-top-default.append-bottom-default
.col-lg-12
= form_for project_subscriptions_path(@project), method: :post, authenticity_token: true do |f|
%fieldset
.form-group
= f.label :upstream_project_id do
= _("Project path")
= f.text_field :upstream_project_id, class: "form-control"
= f.submit _('Subscribe'), class: "btn btn-success float-right"
.row.prepend-top-default.append-bottom-default
.col-lg-12
%h5
= _("Subscriptions")
%span.badge.badge-pill
= @project.upstream_projects.count + @project.downstream_projects.count
%table.table.prepend-top-default
%thead
%tr
%th= _("Project")
%th= _("Author")
%tbody
- @project.upstream_projects.each do |project|
= render 'projects/settings/subscriptions/project', project: project
- @project.downstream_projects.each do |project|
= render 'projects/settings/subscriptions/project', project: project
%tr
%td
= project.name
%td
= user_avatar_without_link(user: project.user, size: 32)
= project.user.name
......@@ -12220,6 +12220,9 @@ msgstr ""
msgid "Pipeline quota"
msgstr ""
msgid "Pipeline subscriptions"
msgstr ""
msgid "Pipeline triggers"
msgstr ""
......@@ -13207,6 +13210,9 @@ msgstr ""
msgid "Project overview"
msgstr ""
msgid "Project path"
msgstr ""
msgid "Project slug"
msgstr ""
......@@ -15651,6 +15657,9 @@ msgstr ""
msgid "Set up new password"
msgstr ""
msgid "Set up pipeline subscriptions for this project."
msgstr ""
msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
msgstr ""
......@@ -16661,6 +16670,12 @@ msgstr ""
msgid "SubscriptionTable|Usage count is performed once a day at 12:00 PM."
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."
msgstr ""
msgid "Subtracted"
msgstr ""
......@@ -17395,6 +17410,9 @@ msgstr ""
msgid "There are no unstaged changes"
msgstr ""
msgid "There is a limit of 100 subscriptions from or to a project."
msgstr ""
msgid "There is already a repository with that name on disk"
msgstr ""
......@@ -18338,7 +18356,7 @@ msgstr ""
msgid "Triggerer"
msgstr ""
msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions."
msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions."
msgstr ""
msgid "Troubleshoot and monitor your application with tracing"
......@@ -20566,6 +20584,9 @@ msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
msgid "default branch"
msgstr ""
msgid "deleted"
msgstr ""
......
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