Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f6ff16eb
Commit
f6ff16eb
authored
Aug 12, 2019
by
Marcel Amirault
Committed by
Achilleas Pipinellis
Aug 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix markdown spacing in various docs
Align images and lists in assorted markdown docs
parent
8e2666bf
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
111 additions
and
117 deletions
+111
-117
doc/user/group/index.md
doc/user/group/index.md
+11
-11
doc/user/group/saml_sso/scim_setup.md
doc/user/group/saml_sso/scim_setup.md
+3
-3
doc/user/project/file_lock.md
doc/user/project/file_lock.md
+1
-1
doc/user/project/import/bitbucket.md
doc/user/project/import/bitbucket.md
+3
-3
doc/user/project/import/bitbucket_server.md
doc/user/project/import/bitbucket_server.md
+4
-4
doc/user/project/import/gemnasium.md
doc/user/project/import/gemnasium.md
+23
-19
doc/user/project/import/manifest.md
doc/user/project/import/manifest.md
+2
-3
doc/user/project/integrations/mattermost_slash_commands.md
doc/user/project/integrations/mattermost_slash_commands.md
+17
-29
doc/user/project/integrations/redmine.md
doc/user/project/integrations/redmine.md
+9
-9
doc/user/project/members/share_project_with_groups.md
doc/user/project/members/share_project_with_groups.md
+3
-3
doc/user/project/merge_requests/merge_request_approvals.md
doc/user/project/merge_requests/merge_request_approvals.md
+12
-9
doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
...domains_ssl_tls_certification/lets_encrypt_integration.md
+1
-1
doc/user/project/pages/getting_started_part_two.md
doc/user/project/pages/getting_started_part_two.md
+22
-22
No files found.
doc/user/group/index.md
View file @
f6ff16eb
doc/user/group/saml_sso/scim_setup.md
View file @
f6ff16eb
doc/user/project/file_lock.md
View file @
f6ff16eb
doc/user/project/import/bitbucket.md
View file @
f6ff16eb
doc/user/project/import/bitbucket_server.md
View file @
f6ff16eb
doc/user/project/import/gemnasium.md
View file @
f6ff16eb
...
...
@@ -5,13 +5,17 @@ instance or GitLab.com.
## Why is Gemnasium.com closed?
Gemnasium
has been
[
acquired by GitLab
](
https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html
)
Gemnasium
was
[
acquired by GitLab
](
https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html
)
in January 2018. Since May 15, 2018, the services provided by Gemnasium are no longer available.
The team behind Gemnasium has joined GitLab as the new Security Products team
and is working on a wider range of tools than just Dependency Scanning:
[
SAST
](
../../application_security/sast/index.md
)
,
[
DAST
](
../../application_security/dast/index.md
)
,
[
Container Scanning
](
../../application_security/container_scanning/index.md
)
and more.
and is working on a
[
wide range of tools
](
../../application_security/index.md
)
,
including:
-
[
Dependency Scanning
](
../../application_security/dependency_scanning/index.md
)
-
[
SAST
](
../../application_security/sast/index.md
)
-
[
DAST
](
../../application_security/dast/index.md
)
-
[
Container Scanning
](
../../application_security/container_scanning/index.md
)
If you want to continue monitoring your dependencies, see the
[
Migrating to GitLab
](
#migrating-to-gitlab
)
section below.
...
...
doc/user/project/import/manifest.md
View file @
f6ff16eb
# Import multiple repositories by uploading a manifest file
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in
GitLab 11.2.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in GitLab 11.2.
GitLab allows you to import all the required Git repositories
based on a manifest file like the one used by the
...
...
doc/user/project/integrations/mattermost_slash_commands.md
View file @
f6ff16eb
...
...
@@ -42,16 +42,12 @@ the administrator console.
!
[
Mattermost go to console
](
img/mattermost_goto_console.png
)
---
1.
Click
**Custom integrations**
and set
**Enable Custom Slash Commands**
,
**Enable custom integrations to override usernames**
, and
**
Override
custom integrations to override profile picture icons
**
to true
!
[
Mattermost console
](
img/mattermost_console_integrations.png
)
---
1.
Click
**Save**
at the bottom to save the changes.
### Step 2. Open the Mattermost slash commands service in GitLab
...
...
@@ -62,15 +58,13 @@ the administrator console.
A screen will appear with all the values you need to copy in Mattermost as
described in the next step. Leave the window open.
>
**Note:**
NOTE:
**Note:**
GitLab will propose some values for the Mattermost settings. The only one
required to copy-paste as-is is the
**Request URL**
, all the others are just
suggestions.
!
[
Mattermost setup instructions
](
img/mattermost_config_help.png
)
---
1.
Proceed to the next step and create a slash command in Mattermost with the
above values.
...
...
@@ -85,19 +79,15 @@ in a new slash command.
!
[
Mattermost team integrations
](
img/mattermost_team_integrations.png
)
---
1.
Go to the
**Slash Commands**
integration and add a new one by clicking the
**Add Slash Command**
button.
!
[
Mattermost add command
](
img/mattermost_add_slash_command.png
)
---
1.
Fill in the options for the custom command as described in
[
step 2
](
#step-2-open-the-mattermost-slash-commands-service-in-gitlab
)
.
>
**Note:**
NOTE:
**Note:**
If you plan on connecting multiple projects, pick a slash command trigger
word that relates to your projects such as
`/gitlab-project-name`
or even
just
`/project-name`
. Only use
`/gitlab`
if you will only connect a single
...
...
@@ -119,8 +109,6 @@ in a new slash command.
1.
Click
**Save changes**
for the changes to take effect.
---
You are now set to start using slash commands in Mattermost that talk to the
GitLab project you configured.
...
...
doc/user/project/integrations/redmine.md
View file @
f6ff16eb
doc/user/project/members/share_project_with_groups.md
View file @
f6ff16eb
doc/user/project/merge_requests/merge_request_approvals.md
View file @
f6ff16eb
...
...
@@ -144,9 +144,12 @@ the following is possible:
-
If the required number of approvals has _not_ been yet met, they can approve
it by clicking the displayed
**Approve**
button.
![Approve](img/approve.png)
-
If the required number of approvals has already been met, they can still
approve it by clicking the displayed
**Approve additionally**
button.
![Add approval](img/approve_additionally.png)
-
**They have already approved this merge request**
: They can remove their approval.
...
...
@@ -159,7 +162,7 @@ if [**Prevent author approval**](#allowing-merge-request-authors-to-approve-thei
For a given merge request, if the approval restrictions have been satisfied,
the merge request is unblocked and can be merged.
Note
,
that meeting the required number of approvals is a necessary, but not
Note that meeting the required number of approvals is a necessary, but not
sufficient condition for unblocking a merge request from being merged. There
are other conditions that may block it, such as merge conflicts,
[
pending discussions
](
../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved
)
...
...
doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
View file @
f6ff16eb
doc/user/project/pages/getting_started_part_two.md
View file @
f6ff16eb
...
...
@@ -123,20 +123,20 @@ where you'll find its default URL.
> **Notes:**
>
> - GitLab Pages [supports any SSG](https://about.gitlab.com/2016/06/17/ssg-overview-gitlab-pages-part-3-examples-ci/), but,
if you don't find yours among the templates, you'll need
to configure your own
`.gitlab-ci.yml`
. To do that, please
read through the article
[
Creating and Tweaking GitLab CI/CD for GitLab Pages
](
getting_started_part_four.md
)
. New SSGs are very welcome among
the
[
example projects
](
https://gitlab.com/pages
)
. If you set
up a new one, please
[
contribute
](
https://gitlab.com/pages/pages.gitlab.io/blob/master/CONTRIBUTING.md
)
to our examples.
>
if you don't find yours among the templates, you'll need
>
to configure your own `.gitlab-ci.yml`. To do that, please
>
read through the article [Creating and Tweaking GitLab CI/CD for GitLab Pages](getting_started_part_four.md). New SSGs are very welcome among
>
the [example projects](https://gitlab.com/pages). If you set
>
up a new one, please
>
[contribute](https://gitlab.com/pages/pages.gitlab.io/blob/master/CONTRIBUTING.md)
>
to our examples.
>
> - The second step _"Clone it to your local computer"_, can be done
differently, achieving the same results: instead of cloning the bare
repository to you local computer and moving your site files into it,
you can run
`git init`
in your local website directory, add the
remote URL:
`git remote add origin git@gitlab.com:namespace/project-name.git`
,
then add, commit, and push to GitLab.
>
differently, achieving the same results: instead of cloning the bare
>
repository to you local computer and moving your site files into it,
>
you can run `git init` in your local website directory, add the
>
remote URL: `git remote add origin git@gitlab.com:namespace/project-name.git`,
>
then add, commit, and push to GitLab.
## URLs and Baseurls
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment