Skip to content

Commit 95075fe

Browse files
committed
Merge branch 'docs-image-alignment-2' into 'master'
Fix markdown spacing in various docs (part 4) See merge request gitlab-org/gitlab-ce!31710
2 parents 8e2666b + f6ff16e commit 95075fe

16 files changed

+119
-125
lines changed

doc/user/group/index.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ To create a new Group, either:
9191

9292
- In the top menu, click **Groups** and then **Your Groups**, and click the green button **New group**.
9393

94-
![new group from groups page](img/new_group_from_groups.png)
94+
![new group from groups page](img/new_group_from_groups.png)
9595

9696
- Or, in the top menu, expand the `plus` sign and choose **New group**.
9797

98-
![new group from elsewhere](img/new_group_from_other_pages.png)
98+
![new group from elsewhere](img/new_group_from_other_pages.png)
9999

100100
Add the following information:
101101

@@ -104,15 +104,15 @@ Add the following information:
104104
1. The **Group name** will automatically populate the URL. Optionally, you can change it.
105105
This is the name that displays in group views.
106106
The name can contain only:
107-
- Alphanumeric characters
108-
- Underscores
109-
- Dashes and dots
110-
- Spaces
107+
- Alphanumeric characters
108+
- Underscores
109+
- Dashes and dots
110+
- Spaces
111111
1. The **Group URL** is the namespace under which your projects will be hosted.
112112
The URL can contain only:
113-
- Alphanumeric characters
114-
- Underscores
115-
- Dashes and dots (it cannot start with dashes or end in a dot)
113+
- Alphanumeric characters
114+
- Underscores
115+
- Dashes and dots (it cannot start with dashes or end in a dot)
116116
1. Optionally, you can add a brief description to tell others
117117
what this group is about.
118118
1. Optionally, choose an avatar for your group.
@@ -166,12 +166,12 @@ There are two different ways to add a new project to a group:
166166

167167
- Select a group, and then click **New project**. You can then continue [creating your project](../../gitlab-basics/create-project.md).
168168

169-
![New project](img/create_new_project_from_group.png)
169+
![New project](img/create_new_project_from_group.png)
170170

171171
- While you are creating a project, select a group namespace
172172
you've already created from the dropdown menu.
173173

174-
![Select group](img/select_group_dropdown.png)
174+
![Select group](img/select_group_dropdown.png)
175175

176176
### Default project-creation level
177177

doc/user/group/saml_sso/scim_setup.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ You can then test the connection by clicking on **Test Connection**. If the conn
9090
1. Create a new mapping by clicking **Add New Mapping** then set **Source attribute** to `objectId`, and **Target attribute** to `externalId`.
9191
1. Click the `userPrincipalName` mapping and change **Match objects using this attribute** to `No`.
9292

93-
Save your changes and you should have the following configuration:
93+
Save your changes and you should have the following configuration:
9494

9595
![Azure's attribute mapping configuration](img/scim_attribute_mapping.png)
9696

97-
NOTE: **Note:** If you used a unique identifier **other than** `objectId`, be sure to map it instead to both `id` and `externalId`.
97+
NOTE: **Note:** If you used a unique identifier **other than** `objectId`, be sure to map it instead to both `id` and `externalId`.
9898

9999
1. Below the mapping list click on **Show advanced options > Edit attribute list for AppName**.
100100
1. Leave the `id` as the primary and only required field.
@@ -108,7 +108,7 @@ You can then test the connection by clicking on **Test Connection**. If the conn
108108
1. Save all the screens and, in the **Provisioning** step, set
109109
the `Provisioning Status` to `On`.
110110

111-
![Provisioning status toggle switch](img/scim_provisioning_status.png)
111+
![Provisioning status toggle switch](img/scim_provisioning_status.png)
112112

113113
NOTE: **Note:**
114114
You can control what is actually synced by selecting the `Scope`. For example,

doc/user/project/file_lock.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To lock a file:
4040
1. Pick the file you want to lock.
4141
1. Click the "Lock" button.
4242

43-
![Locking file](img/file_lock.png)
43+
![Locking file](img/file_lock.png)
4444

4545
To lock an entire directory, look for the "Lock" link next to "History".
4646

doc/user/project/import/bitbucket.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ namespace that started the import process.
4949

5050
1. Click on the "Bitbucket Cloud" button.
5151

52-
![Bitbucket](img/import_projects_from_new_project_page.png)
52+
![Bitbucket](img/import_projects_from_new_project_page.png)
5353

5454
1. Grant GitLab access to your Bitbucket account
5555

56-
![Grant access](img/bitbucket_import_grant_access.png)
56+
![Grant access](img/bitbucket_import_grant_access.png)
5757

5858
1. Click on the projects that you'd like to import or **Import all projects**.
5959
You can also select the namespace under which each project will be
6060
imported.
6161

62-
![Import projects](img/bitbucket_import_select_project.png)
62+
![Import projects](img/bitbucket_import_select_project.png)
6363

6464
[bb-import]: ../../../integration/bitbucket.md
6565
[social sign-in]: ../../profile/account/social_sign_in.md

doc/user/project/import/bitbucket_server.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ namespace that started the import process.
5959
1. Sign in to GitLab and go to your dashboard.
6060
1. Click on **New project**.
6161
1. Click on the "Bitbucket Server" button. If the button is not present, enable the importer in
62-
**Admin > Application Settings > Visibility and access controls > Import sources**.
62+
**Admin > Application Settings > Visibility and access controls > Import sources**.
6363

64-
![Bitbucket](img/import_projects_from_new_project_page.png)
64+
![Bitbucket](img/import_projects_from_new_project_page.png)
6565

6666
1. Enter your Bitbucket Server credentials.
6767

68-
![Grant access](img/bitbucket_server_import_credentials.png)
68+
![Grant access](img/bitbucket_server_import_credentials.png)
6969

7070
1. Click on the projects that you'd like to import or **Import all projects**.
7171
You can also select the namespace under which each project will be
7272
imported.
7373

74-
![Import projects](img/bitbucket_server_import_select_project.png)
74+
![Import projects](img/bitbucket_server_import_select_project.png)

doc/user/project/import/gemnasium.md

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ instance or GitLab.com.
55

66
## Why is Gemnasium.com closed?
77

8-
Gemnasium has been [acquired by GitLab](https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html)
8+
Gemnasium was [acquired by GitLab](https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html)
99
in January 2018. Since May 15, 2018, the services provided by Gemnasium are no longer available.
1010
The team behind Gemnasium has joined GitLab as the new Security Products team
11-
and is working on a wider range of tools than just Dependency Scanning:
12-
[SAST](../../application_security/sast/index.md),
13-
[DAST](../../application_security/dast/index.md),
14-
[Container Scanning](../../application_security/container_scanning/index.md) and more.
11+
and is working on a [wide range of tools](../../application_security/index.md),
12+
including:
13+
14+
- [Dependency Scanning](../../application_security/dependency_scanning/index.md)
15+
- [SAST](../../application_security/sast/index.md)
16+
- [DAST](../../application_security/dast/index.md)
17+
- [Container Scanning](../../application_security/container_scanning/index.md)
18+
1519
If you want to continue monitoring your dependencies, see the
1620
[Migrating to GitLab](#migrating-to-gitlab) section below.
1721

@@ -57,44 +61,44 @@ back to both GitLab and GitHub when completed.
5761

5862
1. Create a new project, and select the "CI/CD for external repo" tab:
5963

60-
![Create new Project](img/gemnasium/create_project.png)
64+
![Create new Project](img/gemnasium/create_project.png)
6165

6266
1. Use the "GitHub" button to connect your repositories.
6367

64-
![Connect from GitHub](img/gemnasium/connect_github.png)
68+
![Connect from GitHub](img/gemnasium/connect_github.png)
6569

6670
1. Select the project(s) to be set up with GitLab CI/CD and chose "Connect".
6771

68-
![Select projects](img/gemnasium/select_project.png)
72+
![Select projects](img/gemnasium/select_project.png)
6973

70-
Once the configuration is done, you may click on your new
71-
project on GitLab.
74+
Once the configuration is done, you may click on your new
75+
project on GitLab.
7276

73-
![click on connected project](img/gemnasium/project_connected.png)
77+
![click on connected project](img/gemnasium/project_connected.png)
7478

75-
Your project is now mirrored on GitLab, where the Runners will be able to access
76-
your source code and run your tests.
79+
Your project is now mirrored on GitLab, where the Runners will be able to access
80+
your source code and run your tests.
7781

78-
Optional step: If you set this up on GitLab.com, make sure the project is
79-
public (in the project settings) if your GitHub project is public, since
80-
the security feature is available only for [GitLab Ultimate](https://about.gitlab.com/pricing).
82+
Optional step: If you set this up on GitLab.com, make sure the project is
83+
public (in the project settings) if your GitHub project is public, since
84+
the security feature is available only for [GitLab Ultimate](https://about.gitlab.com/pricing).
8185

8286
1. To set up the dependency scanning job, corresponding to what Gemnasium was
8387
doing, you must create a `.gitlab-ci.yml` file, or update it according to
8488
the [dependency scanning docs](../../application_security/dependency_scanning/index.md).
8589
The mirroring is pull-only by default, so you may create or update the file on
8690
GitHub:
8791

88-
![Edit gitlab-ci.yml file](img/gemnasium/edit_gitlab-ci.png)
92+
![Edit gitlab-ci.yml file](img/gemnasium/edit_gitlab-ci.png)
8993

9094
1. Once your file has been committed, a new pipeline will be automatically
9195
triggered if your file is valid:
9296

93-
![pipeline](img/gemnasium/pipeline.png)
97+
![pipeline](img/gemnasium/pipeline.png)
9498

9599
1. The result of the job will be visible directly from the pipeline view:
96100

97-
![security report](img/gemnasium/report.png)
101+
![security report](img/gemnasium/report.png)
98102

99103
NOTE: **Note:**
100104
If you don't commit very often to your project, you may want to use

doc/user/project/import/manifest.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Import multiple repositories by uploading a manifest file
22

3-
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in
4-
GitLab 11.2.
3+
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in GitLab 11.2.
54
65
GitLab allows you to import all the required Git repositories
76
based on a manifest file like the one used by the
@@ -56,4 +55,4 @@ You can start the import with:
5655
to the import status page with projects list based on the manifest file.
5756
1. Check the list and click **Import all repositories** to start the import.
5857

59-
![Manifest status](img/manifest_status.png)
58+
![Manifest status](img/manifest_status.png)

doc/user/project/integrations/mattermost_slash_commands.md

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,13 @@ the administrator console.
4040
1. Log in with an account that has admin privileges and navigate to the system
4141
console.
4242

43-
![Mattermost go to console](img/mattermost_goto_console.png)
44-
45-
---
43+
![Mattermost go to console](img/mattermost_goto_console.png)
4644

4745
1. Click **Custom integrations** and set **Enable Custom Slash Commands**,
4846
**Enable custom integrations to override usernames**, and **Override
4947
custom integrations to override profile picture icons** to true
5048

51-
![Mattermost console](img/mattermost_console_integrations.png)
52-
53-
---
49+
![Mattermost console](img/mattermost_console_integrations.png)
5450

5551
1. Click **Save** at the bottom to save the changes.
5652

@@ -62,14 +58,12 @@ the administrator console.
6258
A screen will appear with all the values you need to copy in Mattermost as
6359
described in the next step. Leave the window open.
6460

65-
>**Note:**
66-
GitLab will propose some values for the Mattermost settings. The only one
67-
required to copy-paste as-is is the **Request URL**, all the others are just
68-
suggestions.
69-
70-
![Mattermost setup instructions](img/mattermost_config_help.png)
61+
NOTE: **Note:**
62+
GitLab will propose some values for the Mattermost settings. The only one
63+
required to copy-paste as-is is the **Request URL**, all the others are just
64+
suggestions.
7165

72-
---
66+
![Mattermost setup instructions](img/mattermost_config_help.png)
7367

7468
1. Proceed to the next step and create a slash command in Mattermost with the
7569
above values.
@@ -83,44 +77,38 @@ in a new slash command.
8377
1. Back to Mattermost, under your team page settings, you should see the
8478
**Integrations** option.
8579

86-
![Mattermost team integrations](img/mattermost_team_integrations.png)
87-
88-
---
80+
![Mattermost team integrations](img/mattermost_team_integrations.png)
8981

9082
1. Go to the **Slash Commands** integration and add a new one by clicking the
9183
**Add Slash Command** button.
9284

93-
![Mattermost add command](img/mattermost_add_slash_command.png)
94-
95-
---
85+
![Mattermost add command](img/mattermost_add_slash_command.png)
9686

9787
1. Fill in the options for the custom command as described in
9888
[step 2](#step-2-open-the-mattermost-slash-commands-service-in-gitlab).
9989

100-
>**Note:**
101-
If you plan on connecting multiple projects, pick a slash command trigger
102-
word that relates to your projects such as `/gitlab-project-name` or even
103-
just `/project-name`. Only use `/gitlab` if you will only connect a single
104-
project to your Mattermost team.
90+
NOTE: **Note:**
91+
If you plan on connecting multiple projects, pick a slash command trigger
92+
word that relates to your projects such as `/gitlab-project-name` or even
93+
just `/project-name`. Only use `/gitlab` if you will only connect a single
94+
project to your Mattermost team.
10595

106-
![Mattermost add command configuration](img/mattermost_slash_command_configuration.png)
96+
![Mattermost add command configuration](img/mattermost_slash_command_configuration.png)
10797

10898
1. After you set up all the values, copy the token (we will use it below) and
10999
click **Done**.
110100

111-
![Mattermost slash command token](img/mattermost_slash_command_token.png)
101+
![Mattermost slash command token](img/mattermost_slash_command_token.png)
112102

113103
### Step 4. Copy the Mattermost token into the Mattermost slash command service
114104

115105
1. In GitLab, paste the Mattermost token you copied in the previous step and
116106
check the **Active** checkbox.
117107

118-
![Mattermost copy token to GitLab](img/mattermost_gitlab_token.png)
108+
![Mattermost copy token to GitLab](img/mattermost_gitlab_token.png)
119109

120110
1. Click **Save changes** for the changes to take effect.
121111

122-
---
123-
124112
You are now set to start using slash commands in Mattermost that talk to the
125113
GitLab project you configured.
126114

doc/user/project/integrations/redmine.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
the **Redmine** service, and fill in the required details on the page as described
66
in the table below.
77

8-
| Field | Description |
9-
| ----- | ----------- |
10-
| `description` | A name for the issue tracker (to differentiate between instances, for example) |
11-
| `project_url` | The URL to the project in Redmine which is being linked to this GitLab project |
12-
| `issues_url` | The URL to the issue in Redmine project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the URL. This ID is used by GitLab as a placeholder to replace the issue number. |
13-
| `new_issue_url` | This is the URL to create a new issue in Redmine for the project linked to this GitLab project. **This is currently not being used and will be removed in a future release.** |
8+
| Field | Description |
9+
| ----- | ----------- |
10+
| `description` | A name for the issue tracker (to differentiate between instances, for example) |
11+
| `project_url` | The URL to the project in Redmine which is being linked to this GitLab project |
12+
| `issues_url` | The URL to the issue in Redmine project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the URL. This ID is used by GitLab as a placeholder to replace the issue number. |
13+
| `new_issue_url` | This is the URL to create a new issue in Redmine for the project linked to this GitLab project. **This is currently not being used and will be removed in a future release.** |
1414

15-
Once you have configured and enabled Redmine you'll see the Redmine link on the GitLab project pages that takes you to the appropriate Redmine project.
15+
Once you have configured and enabled Redmine you'll see the Redmine link on the GitLab project pages that takes you to the appropriate Redmine project.
1616

17-
As an example, below is a configuration for a project named gitlab-ci.
17+
As an example, below is a configuration for a project named gitlab-ci.
1818

19-
![Redmine configuration](img/redmine_configuration.png)
19+
![Redmine configuration](img/redmine_configuration.png)
2020

2121
1. To disable the internal issue tracking system in a project, navigate to the General page, expand the [permissions](../settings/index.md#sharing-and-permissions) section and switch the **Issues** toggle to disabled.
2222

doc/user/project/members/share_project_with_groups.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ To share 'Project Acme' with the 'Engineering' group:
2020

2121
1. For 'Project Acme' use the left navigation menu to go to **Settings > Members**
2222

23-
![share project with groups](img/share_project_with_groups.png)
23+
![share project with groups](img/share_project_with_groups.png)
2424

2525
1. Select the 'Share with group' tab
2626
1. Add the 'Engineering' group with the maximum access level of your choice
2727
1. Click **Share** to share it
2828

29-
![share project with groups tab](img/share_project_with_groups_tab.png)
29+
![share project with groups tab](img/share_project_with_groups_tab.png)
3030

3131
1. After sharing 'Project Acme' with 'Engineering', the project will be listed
3232
on the group dashboard
3333

34-
!['Project Acme' is listed as a shared project for 'Engineering'](img/other_group_sees_shared_project.png)
34+
!['Project Acme' is listed as a shared project for 'Engineering'](img/other_group_sees_shared_project.png)
3535

3636
Note that you can only share a project with:
3737

0 commit comments

Comments
 (0)