Commit 70b4da99 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'aqualls-move-push-rules' into 'master'

Move push rules page to better spot

See merge request gitlab-org/gitlab!80242
parents d4650614 3150d109
...@@ -619,7 +619,6 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab ...@@ -619,7 +619,6 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
/doc/operations/product_analytics.md @fneill /doc/operations/product_analytics.md @fneill
/doc/policy/ @axil /doc/policy/ @axil
/doc/public_access/public_access.md @fneill /doc/public_access/public_access.md @fneill
/doc/push_rules/push_rules.md @aqualls
/doc/raketasks/ @axil /doc/raketasks/ @axil
/doc/raketasks/generate_sample_prometheus_data.md @ngaskill /doc/raketasks/generate_sample_prometheus_data.md @ngaskill
/doc/raketasks/migrate_snippets.md @aqualls /doc/raketasks/migrate_snippets.md @aqualls
......
...@@ -31,7 +31,7 @@ and secure supply chain best practices: ...@@ -31,7 +31,7 @@ and secure supply chain best practices:
- [**Merge request approvals**](../user/project/merge_requests/approvals/index.md) - [**Merge request approvals**](../user/project/merge_requests/approvals/index.md)
(for instances, groups, and projects): Configure approvals required for (for instances, groups, and projects): Configure approvals required for
merge requests. merge requests.
- [**Push rules**](../push_rules/push_rules.md) (for instances, groups, and - [**Push rules**](../user/project/repository/push_rules.md) (for instances, groups, and
projects): Control pushes to your repositories. projects): Control pushes to your repositories.
- Separation of duties using [**protected branches**](../user/project/protected_branches.md#require-code-owner-approval-on-a-protected-branch) - Separation of duties using [**protected branches**](../user/project/protected_branches.md#require-code-owner-approval-on-a-protected-branch)
and [**custom CI/CD configuration paths**](../ci/pipelines/settings.md#specify-a-custom-cicd-configuration-file) (for projects): Users can leverage the GitLab cross-project YAML configurations and [**custom CI/CD configuration paths**](../ci/pipelines/settings.md#specify-a-custom-cicd-configuration-file) (for projects): Users can leverage the GitLab cross-project YAML configurations
......
...@@ -1379,7 +1379,7 @@ project or branch name. Special characters can include: ...@@ -1379,7 +1379,7 @@ project or branch name. Special characters can include:
To get around this, you can [change the group path](../../user/group/index.md#change-a-groups-path), To get around this, you can [change the group path](../../user/group/index.md#change-a-groups-path),
[change the project path](../../user/project/settings/index.md#renaming-a-repository) or change the [change the project path](../../user/project/settings/index.md#renaming-a-repository) or change the
branch name. Another option is to create a [push rule](../../push_rules/push_rules.md) to prevent branch name. Another option is to create a [push rule](../../user/project/repository/push_rules.md) to prevent
this at the instance level. this at the instance level.
### Image push errors ### Image push errors
......
...@@ -2491,7 +2491,7 @@ POST /projects/:id/housekeeping ...@@ -2491,7 +2491,7 @@ POST /projects/:id/housekeeping
### Get project push rules ### Get project push rules
Get the [push rules](../push_rules/push_rules.md#enabling-push-rules) of a Get the [push rules](../user/project/repository/push_rules.md#enabling-push-rules) of a
project. project.
```plaintext ```plaintext
......
This diff is collapsed.
...@@ -98,7 +98,7 @@ the tiers are no longer mentioned in GitLab documentation: ...@@ -98,7 +98,7 @@ the tiers are no longer mentioned in GitLab documentation:
- Runners: - Runners:
- Run pipelines in the parent project [for merge requests from a forked project](../ci/pipelines/merge_request_pipelines.md#run-pipelines-in-the-parent-project) - Run pipelines in the parent project [for merge requests from a forked project](../ci/pipelines/merge_request_pipelines.md#run-pipelines-in-the-parent-project)
- [Shared runners CI/CD minutes](../ci/pipelines/cicd_minutes.md) - [Shared runners CI/CD minutes](../ci/pipelines/cicd_minutes.md)
- [Push rules](../push_rules/push_rules.md) - [Push rules](../user/project/repository/push_rules.md)
- SAML for self-managed GitLab instance: - SAML for self-managed GitLab instance:
- [Administrator groups](../integration/saml.md#administrator-groups) - [Administrator groups](../integration/saml.md#administrator-groups)
- [Auditor groups](../integration/saml.md#auditor-groups) - [Auditor groups](../integration/saml.md#auditor-groups)
......
...@@ -32,7 +32,7 @@ The Admin Area is made up of the following sections: ...@@ -32,7 +32,7 @@ The Admin Area is made up of the following sections:
| **{slight-frown}** Abuse Reports | Manage [abuse reports](review_abuse_reports.md) submitted by your users. | | **{slight-frown}** Abuse Reports | Manage [abuse reports](review_abuse_reports.md) submitted by your users. |
| **{license}** License | Upload, display, and remove [licenses](license.md). | | **{license}** License | Upload, display, and remove [licenses](license.md). |
| **{cloud-gear}** Kubernetes | Create and manage instance-level [Kubernetes clusters](../instance/clusters/index.md). | | **{cloud-gear}** Kubernetes | Create and manage instance-level [Kubernetes clusters](../instance/clusters/index.md). |
| **{push-rules}** Push rules | Configure pre-defined Git [push rules](../../push_rules/push_rules.md) for projects. Also, configure [merge requests approvers rules](merge_requests_approvals.md). | | **{push-rules}** Push rules | Configure pre-defined Git [push rules](../project/repository/push_rules.md) for projects. Also, configure [merge requests approvers rules](merge_requests_approvals.md). |
| **{location-dot}** Geo | Configure and maintain [Geo nodes](geo_nodes.md). | | **{location-dot}** Geo | Configure and maintain [Geo nodes](geo_nodes.md). |
| **{key}** Deploy keys | Create instance-wide [SSH deploy keys](../project/deploy_keys/index.md). | | **{key}** Deploy keys | Create instance-wide [SSH deploy keys](../project/deploy_keys/index.md). |
| **{lock}** Credentials | View [credentials](credentials_inventory.md) that can be used to access your instance. | | **{lock}** Credentials | View [credentials](credentials_inventory.md) that can be used to access your instance. |
......
...@@ -56,7 +56,7 @@ To change the hostname used in private commit emails: ...@@ -56,7 +56,7 @@ To change the hostname used in private commit emails:
NOTE: NOTE:
After the hostname is configured, every private commit email using the previous hostname is not After the hostname is configured, every private commit email using the previous hostname is not
recognized by GitLab. This can directly conflict with certain [Push rules](../../../push_rules/push_rules.md) such as recognized by GitLab. This can directly conflict with certain [Push rules](../../project/repository/push_rules.md) such as
`Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`. `Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`.
## Custom additional text **(PREMIUM SELF)** ## Custom additional text **(PREMIUM SELF)**
......
...@@ -789,7 +789,7 @@ Existing forks are not removed. ...@@ -789,7 +789,7 @@ Existing forks are not removed.
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/224129) in GitLab 13.4. > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/224129) in GitLab 13.4.
Group push rules allow group maintainers to set Group push rules allow group maintainers to set
[push rules](../../push_rules/push_rules.md) for newly created projects in the specific group. [push rules](../project/repository/push_rules.md) for newly created projects in the specific group.
To configure push rules for a group: To configure push rules for a group:
......
...@@ -171,7 +171,7 @@ The following table lists project permissions available for each role: ...@@ -171,7 +171,7 @@ The following table lists project permissions available for each role:
| [Repository](project/repository/index.md):<br>Rewrite or remove Git tags | | | ✓ | ✓ | ✓ | | [Repository](project/repository/index.md):<br>Rewrite or remove Git tags | | | ✓ | ✓ | ✓ |
| [Repository](project/repository/index.md):<br>Enable or disable branch protection | | | | ✓ | ✓ | | [Repository](project/repository/index.md):<br>Enable or disable branch protection | | | | ✓ | ✓ |
| [Repository](project/repository/index.md):<br>Enable or disable tag protection | | | | ✓ | ✓ | | [Repository](project/repository/index.md):<br>Enable or disable tag protection | | | | ✓ | ✓ |
| [Repository](project/repository/index.md):<br>Manage [push rules](../push_rules/push_rules.md) | | | | ✓ | ✓ | | [Repository](project/repository/index.md):<br>Manage [push rules](project/repository/push_rules.md) | | | | ✓ | ✓ |
| [Repository](project/repository/index.md):<br>Push to protected branches (*4*) | | | | ✓ | ✓ | | [Repository](project/repository/index.md):<br>Push to protected branches (*4*) | | | | ✓ | ✓ |
| [Repository](project/repository/index.md):<br>Turn on or off protected branch push for developers | | | | ✓ | ✓ | | [Repository](project/repository/index.md):<br>Turn on or off protected branch push for developers | | | | ✓ | ✓ |
| [Repository](project/repository/index.md):<br>Remove fork relationship | | | | | ✓ | | [Repository](project/repository/index.md):<br>Remove fork relationship | | | | | ✓ |
......
...@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Push Options **(FREE)** # Push Options **(FREE)**
GitLab supports using client-side [Git push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt) GitLab supports using client-side [Git push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
to perform various actions at the same time as pushing changes. Additionally, [Push Rules](../../push_rules/push_rules.md) offer server-side control and enforcement options. to perform various actions at the same time as pushing changes. Additionally, [Push Rules](repository/push_rules.md) offer server-side control and enforcement options.
Currently, there are push options available for: Currently, there are push options available for:
......
...@@ -273,7 +273,7 @@ To remove a GPG key from your account: ...@@ -273,7 +273,7 @@ To remove a GPG key from your account:
## Rejecting commits that are not signed **(PREMIUM)** ## Rejecting commits that are not signed **(PREMIUM)**
You can configure your project to reject commits that aren't GPG-signed You can configure your project to reject commits that aren't GPG-signed
via [push rules](../../../../push_rules/push_rules.md). via [push rules](../push_rules.md).
## GPG signing API ## GPG signing API
......
This diff is collapsed.
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%ul %ul
- unless @project.feature_available?(:push_rules) - unless @project.feature_available?(:push_rules)
%li %li
= link_to s_('Promotions|Push Rules'), help_page_path('push_rules/push_rules.md'), target: '_blank', rel: 'noopener noreferrer' = link_to s_('Promotions|Push Rules'), help_page_path('user/project/repository/push_rules.md'), target: '_blank', rel: 'noopener noreferrer'
%p %p
= s_('Promotions|Push Rules are defined per project so you can have different rules applied to different projects depends on your needs.') = s_('Promotions|Push Rules are defined per project so you can have different rules applied to different projects depends on your needs.')
- unless @project.feature_available?(:repository_mirrors) - unless @project.feature_available?(:repository_mirrors)
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
= f.check_box :prevent_secrets, class: "form-check-input", data: { qa_selector: 'prevent_secrets_checkbox' } = f.check_box :prevent_secrets, class: "form-check-input", data: { qa_selector: 'prevent_secrets_checkbox' }
= f.label :prevent_secrets, "Prevent pushing secret files", class: "label-bold form-check-label" = f.label :prevent_secrets, "Prevent pushing secret files", class: "label-bold form-check-label"
%p.text-muted %p.text-muted
- secret_files_link_url = help_page_path('push_rules/push_rules', anchor: 'prevent-pushing-secrets-to-the-repository') - secret_files_link_url = help_page_path('user/project/repository/push_rules', anchor: 'prevent-pushing-secrets-to-the-repository')
- secret_files_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: secret_files_link_url } - secret_files_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: secret_files_link_url }
= s_("PushRules|Reject any files likely to contain secrets. %{secret_files_link_start}What secret files are rejected?%{secret_files_link_end}").html_safe % { secret_files_link_start: secret_files_link_start, secret_files_link_end: '</a>'.html_safe } = s_("PushRules|Reject any files likely to contain secrets. %{secret_files_link_start}What secret files are rejected?%{secret_files_link_end}").html_safe % { secret_files_link_start: secret_files_link_start, secret_files_link_end: '</a>'.html_safe }
......
# List of regular expressions to prevent secrets # List of regular expressions to prevent secrets
# being pushed to repository. # being pushed to repository.
# This list is checked only if project.push_rule.prevent_secrets is true # This list is checked only if project.push_rule.prevent_secrets is true
# Any changes to this file should be documented in: doc/push_rules/push_rules.md # Any changes to this file should be documented in: doc/user/project/repository/push_rules.md
# AWS CLI credential blobs # AWS CLI credential blobs
...@@ -23,4 +23,3 @@ ...@@ -23,4 +23,3 @@
# files ending in .history or _history # files ending in .history or _history
- "[._]history$" - "[._]history$"
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