root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2024-07-11 09:28:06 +00:00
parent cdff856b1f
commit d3cdd617f1
8 changed files with 89 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
View File

@ -86,9 +86,10 @@ export default {
},
workItemWeight() {
/** TODO remove this check after https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158021 is merged */
return (
this.isWidgetPresent(WIDGET_TYPE_WEIGHT) && this.workItemType !== WORK_ITEM_TYPE_VALUE_EPIC
);
if (this.workItemType !== WORK_ITEM_TYPE_VALUE_EPIC) {
return this.isWidgetPresent(WIDGET_TYPE_WEIGHT);
}
return false;
},
workItemParticipants() {
return this.isWidgetPresent(WIDGET_TYPE_PARTICIPANTS);

BIN
doc/architecture/blueprints/cells/diagrams/term-cell-runner.drawio.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 39 KiB

BIN
doc/architecture/blueprints/duo_workflow/diagrams/duo_workflow_auth.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 54 KiB

2
doc/topics/git/index.md
View File

@ -47,7 +47,7 @@ A typical Git user encounters these concepts soon after starting to use Git:
- [`git add`](../../gitlab-basics/add-file.md) to start tracking files with Git.
- [Tags](../../user/project/repository/tags/index.md) and
[branches](../../user/project/repository/branches/index.md).
- [How to undo changes](undo.md), including [`git reset`](rollback_commits.md).
- [How to undo changes](undo.md), including `git reset`.
- View a chronological list of changes to a file with
[Git history](../../user/project/repository/files/git_history.md).
- View a line-by-line editing history of a file with

11
doc/topics/git/rollback_commits.md
View File

@ -1,11 +0,0 @@
---
redirect_to: 'undo.md'
remove_date: '2024-07-10'
---
This document was moved to [another location](undo.md).
<!-- This redirect file can be deleted after <2024-07-10>. -->
<!-- Redirects that point to other docs in the same project expire in three months. -->
<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->

1
doc/tutorials/build_application.md
View File

@ -19,6 +19,7 @@ Use CI/CD pipelines to automatically build, test, and deploy your code.
| [GitLab CI Fundamentals](https://university.gitlab.com/learn/learning-path/gitlab-ci-fundamentals) | Learn about GitLab CI/CD and build a pipeline in this self-paced course. | **{star}** |
| <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [CI deep dive](https://www.youtube.com/watch?v=ZVUbmVac-m8&list=PL05JrBw4t0KorkxIFgZGnzzxjZRCGROt_&index=27) (22m 51s) | Take a closer look at pipelines and continuous integration concepts. | |
| [Set up CI/CD in the cloud](../ci/examples/index.md#cicd-in-the-cloud) | Learn how to set up CI/CD in different cloud-based environments. | |
| [Create a GitLab pipeline to push to Google Artifact Registry](create_gitlab_pipeline_push_to_google_artifact_registry/index.md) | Learn how to connect GitLab to Google Cloud and create a pipeline to push images to Artifact Registry. | |
| [Find CI/CD examples and templates](../ci/examples/index.md#cicd-examples) | Use these examples and templates to set up CI/CD for your use case. | |
| <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Understand CI/CD rules](https://www.youtube.com/watch?v=QjQc-zeL16Q) (8m 56s) | Learn more about how to use CI/CD rules. | |
| [Use Auto DevOps to deploy an application](../topics/autodevops/cloud_deployments/auto_devops_with_gke.md) | Deploy an application to Google Kubernetes Engine (GKE). | |

128
doc/user/project/wiki/index.md
View File

@ -20,10 +20,7 @@ Wiki pages written in Markdown support all [Markdown features](../../markdown.md
and also provide some [wiki-specific behavior](../../markdown.md#wiki-specific-markdown)
for links.
Wiki pages display a sidebar, which you [can customize](#customize-sidebar). This
sidebar contains a partial list of pages in the wiki, displayed as a nested tree,
with sibling pages listed in alphabetical order. To view a list of all pages, select
**View All Pages** in the sidebar:
Wiki pages also display a [sidebar](#sidebar), which [you can customize](#customize-sidebar).
## View a project wiki
@ -53,15 +50,18 @@ for previously created wikis.
## Create the wiki home page
> - Separation of page title and path [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30758) in GitLab 17.2 [with flags](../../../administration/feature_flags.md) named `wiki_front_matter` and `wiki_front_matter_title`. Enabled by default.
When a wiki is created, it is empty. On your first visit, you can create the
home page users see when viewing the wiki. This page requires a specific title
home page users see when viewing the wiki. This page requires a specific path
to be used as your wiki's home page. To create it:
1. On the left sidebar, select **Search or go to** and find your project or group.
1. Select **Plan > Wiki**.
1. Select **Create your first page**.
1. GitLab requires this first page be titled `home`. The page with this
title serves as the front page for your wiki.
1. Optional. Change the **Title** of the home page.
1. GitLab requires this first page to have path `home`. The page on this
path serves as the front page for your wiki.
1. Select a **Format** for styling your text.
1. Add a welcome message for your home page in the **Content** section. You can
always edit it later.
@ -71,6 +71,8 @@ to be used as your wiki's home page. To create it:
## Create a new wiki page
> - Separation of page title and path [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30758) in GitLab 17.2 [with flags](../../../administration/feature_flags.md) named `wiki_front_matter` and `wiki_front_matter_title`. Enabled by default.
Prerequisites:
- You must have at least the Developer role.
@ -79,10 +81,11 @@ Prerequisites:
1. Select **Plan > Wiki**.
1. Select **Wiki actions** (**{ellipsis_v}**), then **New page** on this page, or any other wiki page.
1. Select a content format.
1. Add a title for your new page. Page titles use
[special characters](#special-characters-in-page-titles) for subdirectories and formatting,
1. Add a **Title** for your new page.
1. Optional. Uncheck **Generate page path from title** and change the **Path** of the page.
Page paths use [special characters](#special-characters-in-page-paths) for subdirectories and formatting,
and have [length restrictions](#length-restrictions-for-file-and-directory-names).
1. Add content to your wiki page.
1. Optional. Add content to your wiki page.
1. Optional. Attach a file, and GitLab stores it in the wiki's Git repository.
1. Add a **Commit message**. Git requires a commit message, so GitLab creates one
if you don't enter one yourself.
@ -107,17 +110,30 @@ Files with unsupported extensions don't display when pushed to GitLab:
- AsciiDoc extensions: `.adoc`, `.ad`, `.asciidoc`.
- Other markup extensions: `.textile`, `.rdoc`, `.org`, `.creole`, `.wiki`, `.mediawiki`, `.rst`.
### Special characters in page titles
### Special characters in page paths
Wiki pages are stored as files in a Git repository, so certain characters have a special meaning:
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133521) front matter based titles in GitLab 16.7 [with flags](../../../administration/feature_flags.md) named `wiki_front_matter` and `wiki_front_matter_title`. Disabled by default.
> - Feature flags [`wiki_front_matter`](https://gitlab.com/gitlab-org/gitlab/-/issues/435056) and [`wiki_front_matter_title`](https://gitlab.com/gitlab-org/gitlab/-/issues/428259) enabled by default in GitLab 17.2.
Wiki pages are stored as files in a Git repository, and by default, the filename of
a page is also its title. Certain characters in the filename have a special meaning:
- Spaces are converted into hyphens when storing a page.
- Hyphens (`-`) are converted back into spaces when displaying a page.
- Slashes (`/`) are used as path separators, and can't be displayed in titles. If you
create a title containing `/` characters, GitLab creates all the subdirectories
create a file with title containing `/` characters, GitLab creates all the subdirectories
needed to build that path. For example, a title of `docs/my-page` creates a wiki
page with a path `/wikis/docs/my-page`.
To circumvent these limitations, you can also store the title of a wiki page in a
front matter block before a page's contents. For example:
```yaml
---
title: Page title
---
```
### Length restrictions for file and directory names
Many common file systems have a [limit of 255 bytes](https://en.wikipedia.org/wiki/Comparison_of_file_systems#Limits)
@ -126,7 +142,7 @@ those limits. However, if your file system enforces these limits, you cannot che
local copy of a wiki that contains filenames exceeding this limit. To prevent this
problem, the GitLab web interface and API enforce these limits:
- 245 bytes for page titles (reserving 10 bytes for the file extension).
- 245 bytes for filenames (reserving 10 bytes for the file extension).
- 255 bytes for directory names.
Non-ASCII characters take up more than one byte.
@ -152,8 +168,14 @@ Unsaved changes to a wiki page are preserved in local browser storage to prevent
### Create a table of contents
To generate a table of contents from a wiki page's subheadings, use the `[[_TOC_]]` tag.
For an example, read [Table of contents](../../markdown.md#table-of-contents).
> - Table of contents in the wiki sidebar [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/281570) in GitLab 17.2.
Wiki pages with headings in their contents automatically display a table of contents
section in the sidebar.
You can also choose to optionally display a separate table of contents section on the page
itself. To generate a table of contents from a wiki page's subheadings, use the
`[[_TOC_]]` tag. For an example, read [Table of contents](../../markdown.md#table-of-contents).
## Delete a wiki page
@ -170,6 +192,7 @@ Prerequisites:
## Move or rename a wiki page
> - Redirects for moved or renamed wiki pages [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/257892) in GitLab 17.1 [with a flag](../../../administration/feature_flags.md) named `wiki_redirection`. Enabled by default.
> - Separation of page title and path [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30758) in GitLab 17.2 [with flags](../../../administration/feature_flags.md) named `wiki_front_matter` and `wiki_front_matter_title`. Enabled by default.
In GitLab 17.1 and later, when you move or rename a page, a redirect is
automatically set up from the old page to the new page. A list of redirects
@ -183,10 +206,10 @@ Prerequisites:
1. Select **Plan > Wiki**.
1. Go to the page you want to move or rename.
1. Select **Edit**.
1. To move the page, add the new path to the **Title** field. For example,
1. To move the page, add the new path to the **Path** field. For example,
if you have a wiki page called `About` under `Company` and you want to
move it to the wiki's root, change the **Title** from `About` to `/About`.
1. To rename the page, change the **Title**.
move it to the wiki's root, change the **Path** from `About` to `/About`.
1. To rename the page, change the **Path**.
1. Select **Save changes**.
## Export a wiki page
@ -246,7 +269,7 @@ Prerequisites:
The changes of a wiki page over time are recorded in the wiki's Git repository.
The history page shows:
- The revision (Git commit SHA) of the page.
- The revision of the page.
- The page author.
- The commit message.
- The last update.
@ -257,7 +280,7 @@ To view the changes for a wiki page:
1. On the left sidebar, select **Search or go to** and find your project or group.
1. Select **Plan > Wiki**.
1. Go to the page you want to view history for.
1. Select **Page history**.
1. Select **Wiki actions** (**{ellipsis_v}**), then **Page history**.
### View changes between page versions
@ -266,21 +289,24 @@ You can see the changes made in a version of a wiki page, similar to versioned d
1. On the left sidebar, select **Search or go to** and find your project or group.
1. Select **Plan > Wiki**.
1. Go to the wiki page you're interested in.
1. Select **Page history** to see all page versions.
1. Select the commit message in the **Changes** column for the version you're interested in.
1. Select **Wiki actions** (**{ellipsis_v}**), then **Page history** to see all page versions.
1. Select the commit message in the **Diff** column for the version you're interested in.
## Track wiki events
## Sidebar
GitLab tracks wiki creation, deletion, and update events. These events are displayed on these pages:
> - Searching by title in the sidebar [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156054) in GitLab 17.1.
> - Limit of 15 items in the sidebar [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158084) in GitLab 17.2.
- [User profile](../../profile/index.md#access-your-user-profile).
- Activity pages, depending on the type of wiki:
- [Group activity](../../group/manage.md#view-group-activity).
- [Project activity](../working_with_projects.md#view-project-activity).
Wiki pages display a sidebar that contains a list of pages in the wiki,
displayed as a nested tree, with sibling pages listed in alphabetical order.
Commits to wikis are not counted in [repository analytics](../../analytics/repository_analytics.md).
You can quickly find a page by its title in the wiki using the search box in
the sidebar.
## Customize sidebar
For performance reasons, the sidebar is limited to displaying 5000 entries. To
view a list of all pages, select **View All Pages** in the sidebar.
### Customize sidebar
You can manually edit the contents of the sidebar navigation.
@ -371,7 +397,7 @@ to disable the wiki but toggle it on (in blue).
> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/398152) from content editor to rich text editor in GitLab 16.2.
GitLab provides a WYSIWYG editing experience for GitLab Flavored Markdown in wikis.
GitLab provides a rich text editing experience for GitLab Flavored Markdown in wikis.
Support includes:
@ -379,24 +405,21 @@ Support includes:
- Formatting ordered lists, unordered lists, and checklists.
- Creating and editing table structure.
- Inserting and formatting code blocks with syntax highlighting.
- Previewing Mermaid, PlantUML, and Kroki diagrams ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86701) in GitLab 15.2).
- Creating and editing HTML comments ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104084) in GitLab 15.7).
- Previewing Mermaid, PlantUML, and Kroki diagrams.
### Use the rich text editor
1. [Create](#create-a-new-wiki-page) a new wiki page, or [edit](#edit-a-wiki-page) an existing one.
1. Select **Markdown** as your format.
1. Above **Content**, select **Edit rich text**.
1. Under **Content**, in the lower-left corner, select **Switch to rich text editing**.
1. Customize your page's content using the various formatting options available in the rich text editor.
1. Select **Create page** for a new page, or **Save changes** for an existing page.
The rich text editing mode remains the default until you switch back to
[edit the raw source](#switch-back-to-the-old-editor).
To switch back to plain text, select **Switch to plain text editing**.
### Switch back to the old editor
See also:
1. *If you're editing the page in the rich text editor,* scroll to **Content**.
1. Select **Edit source**.
- [Rich text editor](../../rich_text_editor.md)
### GitLab Flavored Markdown support
@ -406,13 +429,16 @@ For the status of the ongoing development for CommonMark and GitLab Flavored Mar
- [Basic Markdown formatting extensions](https://gitlab.com/groups/gitlab-org/-/epics/5404) epic.
- [GitLab Flavored Markdown extensions](https://gitlab.com/groups/gitlab-org/-/epics/5438) epic.
## Related topics
## Track wiki events
- [Wiki settings for administrators](../../../administration/wikis/index.md)
- [Project wikis API](../../../api/wikis.md)
- [Group repository storage moves API](../../../api/group_repository_storage_moves.md)
- [Group wikis API](../../../api/group_wikis.md)
- [Wiki keyboard shortcuts](../../shortcuts.md#wiki-pages)
GitLab tracks wiki creation, deletion, and update events. These events are displayed on the following pages:
- [User profile](../../profile/index.md#access-your-user-profile).
- Activity pages, depending on the type of wiki:
- [Group activity](../../group/manage.md#view-group-activity).
- [Project activity](../working_with_projects.md#view-project-activity).
Commits to wikis are not counted in [repository analytics](../../analytics/repository_analytics.md).
## Troubleshooting
@ -454,3 +480,13 @@ To clear all data from a project wiki and recreate it in a blank state:
```
All data from the wiki has been cleared, and the wiki is ready for use.
## Related topics
- [Wiki settings for administrators](../../../administration/wikis/index.md)
- [Project wikis API](../../../api/wikis.md)
- [Group wikis API](../../../api/group_wikis.md)
- [Group repository storage moves API](../../../api/group_repository_storage_moves.md)
- [Wiki keyboard shortcuts](../../shortcuts.md#wiki-pages)
- [GitLab Flavored Markdown](../../markdown.md)
- [Asciidoc](../../asciidoc.md)

2
spec/features/profiles/oauth_applications_spec.rb
View File

@ -83,7 +83,7 @@ RSpec.describe 'Profile > Applications', feature_category: :user_profile do
end
end
it 'deletes an authorized application' do
it 'deletes an authorized application', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/444512' do
token
visit oauth_applications_path