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
23c6b053
Commit
23c6b053
authored
Feb 03, 2020
by
Marcel Amirault
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '32881-selhorn-codetags' into 'master'
Add more language tags See merge request gitlab-org/gitlab!24009
parents
36050ce1
b023c603
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
31 deletions
+31
-31
doc/user/project/import/svn.md
doc/user/project/import/svn.md
+7
-7
doc/user/project/integrations/webhooks.md
doc/user/project/integrations/webhooks.md
+13
-13
doc/user/project/issues/managing_issues.md
doc/user/project/issues/managing_issues.md
+1
-1
doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
...t/merge_requests/reviewing_and_managing_merge_requests.md
+8
-8
doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
...oject/pages/custom_domains_ssl_tls_certification/index.md
+2
-2
No files found.
doc/user/project/import/svn.md
View file @
23c6b053
...
@@ -43,14 +43,14 @@ installations from source, the default repository directory will be
...
@@ -43,14 +43,14 @@ installations from source, the default repository directory will be
`/home/git/repositories/USER/REPO.git`
. For convenience, assign this path to a
`/home/git/repositories/USER/REPO.git`
. For convenience, assign this path to a
variable:
variable:
```
```
shell
GIT_REPO_PATH
=
/var/opt/gitlab/git-data/repositories/USER/REPOS.git
GIT_REPO_PATH
=
/var/opt/gitlab/git-data/repositories/USER/REPOS.git
```
```
SubGit will keep this repository in sync with a remote SVN project. For
SubGit will keep this repository in sync with a remote SVN project. For
convenience, assign your remote SVN project URL to a variable:
convenience, assign your remote SVN project URL to a variable:
```
```
shell
SVN_PROJECT_URL
=
http://svn.company.com/repos/project
SVN_PROJECT_URL
=
http://svn.company.com/repos/project
```
```
...
@@ -58,14 +58,14 @@ Next you need to run SubGit to set up a Git/SVN mirror. Make sure the following
...
@@ -58,14 +58,14 @@ Next you need to run SubGit to set up a Git/SVN mirror. Make sure the following
`subgit`
command is ran on behalf of the same user that keeps ownership of
`subgit`
command is ran on behalf of the same user that keeps ownership of
GitLab Git repositories (by default
`git`
):
GitLab Git repositories (by default
`git`
):
```
```
shell
subgit configure
--layout
auto
$SVN_PROJECT_URL
$GIT_REPO_PATH
subgit configure
--layout
auto
$SVN_PROJECT_URL
$GIT_REPO_PATH
```
```
Adjust authors and branches mappings, if necessary. Open with your favorite
Adjust authors and branches mappings, if necessary. Open with your favorite
text editor:
text editor:
```
```
shell
edit
$GIT_REPO_PATH
/subgit/authors.txt
edit
$GIT_REPO_PATH
/subgit/authors.txt
edit
$GIT_REPO_PATH
/subgit/config
edit
$GIT_REPO_PATH
/subgit/config
```
```
...
@@ -78,7 +78,7 @@ For more information regarding the SubGit configuration options, refer to
...
@@ -78,7 +78,7 @@ For more information regarding the SubGit configuration options, refer to
Now that SubGit has configured the Git/SVN repos, run
`subgit`
to perform the
Now that SubGit has configured the Git/SVN repos, run
`subgit`
to perform the
initial translation of existing SVN revisions into the Git repository:
initial translation of existing SVN revisions into the Git repository:
```
```
shell
subgit
install
$GIT_REPO_PATH
subgit
install
$GIT_REPO_PATH
```
```
...
@@ -90,7 +90,7 @@ works transparently and does not require any special commands.
...
@@ -90,7 +90,7 @@ works transparently and does not require any special commands.
If you would prefer to perform one-time cut over migration with
`subgit`
, use
If you would prefer to perform one-time cut over migration with
`subgit`
, use
the
`import`
command instead of
`install`
:
the
`import`
command instead of
`install`
:
```
```
shell
subgit import
$GIT_REPO_PATH
subgit import
$GIT_REPO_PATH
```
```
...
@@ -145,7 +145,7 @@ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/ //g' | so
...
@@ -145,7 +145,7 @@ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/ //g' | so
Use the output from the last command to construct the authors file.
Use the output from the last command to construct the authors file.
Create a file called
`authors.txt`
and add one mapping per line.
Create a file called
`authors.txt`
and add one mapping per line.
```
```
plaintext
janedoe = Jane Doe <janedoe@example.com>
janedoe = Jane Doe <janedoe@example.com>
johndoe = John Doe <johndoe@example.com>
johndoe = John Doe <johndoe@example.com>
```
```
...
...
doc/user/project/integrations/webhooks.md
View file @
23c6b053
...
@@ -126,7 +126,7 @@ Also, if a single push includes changes for more than three (by default, dependi
...
@@ -126,7 +126,7 @@ Also, if a single push includes changes for more than three (by default, dependi
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Push Hook
X-Gitlab-Event: Push Hook
```
```
...
@@ -213,7 +213,7 @@ If a single push includes changes for more than three (by default, depending on
...
@@ -213,7 +213,7 @@ If a single push includes changes for more than three (by default, depending on
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Tag Push Hook
X-Gitlab-Event: Tag Push Hook
```
```
...
@@ -267,7 +267,7 @@ Triggered when a new issue is created or an existing issue was updated/closed/re
...
@@ -267,7 +267,7 @@ Triggered when a new issue is created or an existing issue was updated/closed/re
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Issue Hook
X-Gitlab-Event: Issue Hook
```
```
...
@@ -402,7 +402,7 @@ Valid target types:
...
@@ -402,7 +402,7 @@ Valid target types:
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Note Hook
X-Gitlab-Event: Note Hook
```
```
...
@@ -482,7 +482,7 @@ X-Gitlab-Event: Note Hook
...
@@ -482,7 +482,7 @@ X-Gitlab-Event: Note Hook
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Note Hook
X-Gitlab-Event: Note Hook
```
```
...
@@ -609,7 +609,7 @@ X-Gitlab-Event: Note Hook
...
@@ -609,7 +609,7 @@ X-Gitlab-Event: Note Hook
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Note Hook
X-Gitlab-Event: Note Hook
```
```
...
@@ -714,7 +714,7 @@ X-Gitlab-Event: Note Hook
...
@@ -714,7 +714,7 @@ X-Gitlab-Event: Note Hook
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Note Hook
X-Gitlab-Event: Note Hook
```
```
...
@@ -790,7 +790,7 @@ Triggered when a new merge request is created, an existing merge request was upd
...
@@ -790,7 +790,7 @@ Triggered when a new merge request is created, an existing merge request was upd
**Request header**
:
**Request header**
:
```
```
plaintext
X-Gitlab-Event: Merge Request Hook
X-Gitlab-Event: Merge Request Hook
```
```
...
@@ -951,7 +951,7 @@ Triggered when a wiki page is created, updated or deleted.
...
@@ -951,7 +951,7 @@ Triggered when a wiki page is created, updated or deleted.
**Request Header**
:
**Request Header**
:
```
```
plaintext
X-Gitlab-Event: Wiki Page Hook
X-Gitlab-Event: Wiki Page Hook
```
```
...
@@ -1007,7 +1007,7 @@ Triggered on status change of Pipeline.
...
@@ -1007,7 +1007,7 @@ Triggered on status change of Pipeline.
**Request Header**
:
**Request Header**
:
```
```
plaintext
X-Gitlab-Event: Pipeline Hook
X-Gitlab-Event: Pipeline Hook
```
```
...
@@ -1215,7 +1215,7 @@ Triggered on status change of a job.
...
@@ -1215,7 +1215,7 @@ Triggered on status change of a job.
**Request Header**
:
**Request Header**
:
```
```
plaintext
X-Gitlab-Event: Job Hook
X-Gitlab-Event: Job Hook
```
```
...
@@ -1328,7 +1328,7 @@ If the endpoint doesn't send its HTTP response within those 10 seconds, GitLab m
...
@@ -1328,7 +1328,7 @@ If the endpoint doesn't send its HTTP response within those 10 seconds, GitLab m
If you are receiving multiple requests, you can try increasing the default value to wait for the HTTP response after sending the webhook
If you are receiving multiple requests, you can try increasing the default value to wait for the HTTP response after sending the webhook
by uncommenting or adding the following setting to your
`/etc/gitlab/gitlab.rb`
:
by uncommenting or adding the following setting to your
`/etc/gitlab/gitlab.rb`
:
```
```
ruby
gitlab_rails
[
'webhook_timeout'
]
=
10
gitlab_rails
[
'webhook_timeout'
]
=
10
```
```
...
@@ -1370,7 +1370,7 @@ Pick an unused port (e.g. 8000) and start the script: `ruby print_http_body.rb
...
@@ -1370,7 +1370,7 @@ Pick an unused port (e.g. 8000) and start the script: `ruby print_http_body.rb
When you press 'Test' in GitLab, you should see something like this in the
When you press 'Test' in GitLab, you should see something like this in the
console:
console:
```
```
plaintext
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
- -> /
- -> /
...
...
doc/user/project/issues/managing_issues.md
View file @
23c6b053
...
@@ -198,7 +198,7 @@ source code that can match references to:
...
@@ -198,7 +198,7 @@ source code that can match references to:
For example the following commit message:
For example the following commit message:
```
```
plaintext
Awesome commit message
Awesome commit message
Fix #20, Fixes #21 and Closes group/otherproject#22.
Fix #20, Fixes #21 and Closes group/otherproject#22.
...
...
doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
View file @
23c6b053
...
@@ -200,7 +200,7 @@ project is a fork (even a private fork) of the target project.
...
@@ -200,7 +200,7 @@ project is a fork (even a private fork) of the target project.
Add the following alias to your
`~/.gitconfig`
:
Add the following alias to your
`~/.gitconfig`
:
```
```
plaintext
[alias]
[alias]
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
```
```
...
@@ -209,7 +209,7 @@ Now you can check out a particular merge request from any repository and any
...
@@ -209,7 +209,7 @@ Now you can check out a particular merge request from any repository and any
remote. For example, to check out the merge request with ID 5 as shown in GitLab
remote. For example, to check out the merge request with ID 5 as shown in GitLab
from the
`origin`
remote, do:
from the
`origin`
remote, do:
```
```
shell
git mr origin 5
git mr origin 5
```
```
...
@@ -221,7 +221,7 @@ it out.
...
@@ -221,7 +221,7 @@ it out.
Locate the section for your GitLab remote in the
`.git/config`
file. It looks
Locate the section for your GitLab remote in the
`.git/config`
file. It looks
like this:
like this:
```
```
plaintext
[remote "origin"]
[remote "origin"]
url = https://gitlab.com/gitlab-org/gitlab-foss.git
url = https://gitlab.com/gitlab-org/gitlab-foss.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin/*
...
@@ -229,19 +229,19 @@ like this:
...
@@ -229,19 +229,19 @@ like this:
You can open the file with:
You can open the file with:
```
```
shell
git config
-e
git config
-e
```
```
Now add the following line to the above section:
Now add the following line to the above section:
```
```
plaintext
fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
```
```
In the end, it should look like this:
In the end, it should look like this:
```
```
plaintext
[remote "origin"]
[remote "origin"]
url = https://gitlab.com/gitlab-org/gitlab-foss.git
url = https://gitlab.com/gitlab-org/gitlab-foss.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin/*
...
@@ -250,7 +250,7 @@ In the end, it should look like this:
...
@@ -250,7 +250,7 @@ In the end, it should look like this:
Now you can fetch all the merge requests:
Now you can fetch all the merge requests:
```
```
shell
git fetch origin
git fetch origin
...
...
...
@@ -262,7 +262,7 @@ From https://gitlab.com/gitlab-org/gitlab-foss.git
...
@@ -262,7 +262,7 @@ From https://gitlab.com/gitlab-org/gitlab-foss.git
And to check out a particular merge request:
And to check out a particular merge request:
```
```
shell
git checkout origin/merge-requests/1
git checkout origin/merge-requests/1
```
```
...
...
doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
View file @
23c6b053
...
@@ -174,13 +174,13 @@ from the GitLab project.
...
@@ -174,13 +174,13 @@ from the GitLab project.
To manually verify that you have properly configured the domain verification
To manually verify that you have properly configured the domain verification
`TXT`
DNS entry, you can run the following command in your terminal:
`TXT`
DNS entry, you can run the following command in your terminal:
```
```
shell
dig _gitlab-pages-verification-code.<YOUR-PAGES-DOMAIN> TXT
dig _gitlab-pages-verification-code.<YOUR-PAGES-DOMAIN> TXT
```
```
Expect the output:
Expect the output:
```
```
plaintext
;; ANSWER SECTION:
;; ANSWER SECTION:
_gitlab-pages-verification-code.<YOUR-PAGES-DOMAIN>. 300 IN TXT "gitlab-pages-verification-code=<YOUR-VERIFICATION-CODE>"
_gitlab-pages-verification-code.<YOUR-PAGES-DOMAIN>. 300 IN TXT "gitlab-pages-verification-code=<YOUR-VERIFICATION-CODE>"
```
```
...
...
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