Skip to content
Snippets Groups Projects
Commit bb19d187 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 4fe93274
No related branches found
No related tags found
No related merge requests found
Showing
with 81 additions and 65 deletions
# Checks for use of first person pronouns.
#
# For a list of all options, see https://errata-ai.github.io/vale/styles/
extends: existence
message: '`%s` is a first-person pronoun. Use second- or third-person pronouns (like we, you, us, one) instead.'
level: warning
ignorecase: true
link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
tokens:
- '\bI[ ,;:?!"]|\bI\x27.{1,2}'
- me
- myself
- mine
---
# Checks for use of top misused terms at GitLab.
# Checks for use of some of the top misused terms at GitLab.
#
# For a list of all options, see https://errata-ai.github.io/vale/styles/
extends: substitution
message: Use "%s" instead of "%s."
message: Use `%s` instead of `%s`.
link: https://about.gitlab.com/handbook/communication/#top-misused-terms
level: warning
nonword: true
Loading
Loading
Loading
Loading
@@ -32,8 +32,8 @@ Example response:
"id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5",
"title": "Replace sanitize with escape once",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dzaporozhets@sphereconsultinginc.com",
"author_name": "Example User",
"author_email": "user@example.com",
"authored_date": "2012-09-20T11:50:22+03:00",
"committer_name": "Administrator",
"committer_email": "admin@example.com",
Loading
Loading
@@ -50,9 +50,9 @@ Example response:
"short_id": "6104942438c",
"title": "Sanitize for network graph",
"author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com",
"committer_name": "Dmitriy",
"committer_email": "dmitriy.zaporozhets@gmail.com",
"author_email": "user@example.com",
"committer_name": "ExampleName",
"committer_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph",
"parent_ids": [
Loading
Loading
@@ -142,10 +142,10 @@ Example response:
"id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5",
"title": "some commit message",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dzaporozhets@sphereconsultinginc.com",
"committer_name": "Dmitriy Zaporozhets",
"committer_email": "dzaporozhets@sphereconsultinginc.com",
"author_name": "Example User",
"author_email": "user@example.com",
"committer_name": "Example User",
"committer_email": "user@example.com",
"created_at": "2016-09-20T09:26:24.000-07:00",
"message": "some commit message",
"parent_ids": [
Loading
Loading
@@ -217,9 +217,9 @@ Example response:
"short_id": "6104942438c",
"title": "Sanitize for network graph",
"author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_email": "user@example.com",
"committer_name": "Dmitriy",
"committer_email": "dmitriy.zaporozhets@gmail.com",
"committer_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph",
"committed_date": "2012-09-20T09:06:12+03:00",
Loading
Loading
@@ -307,15 +307,15 @@ Example response:
"id": "8b090c1b79a14f2bd9e8a738f717824ff53aebad",
"short_id": "8b090c1b",
"title": "Feature added",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_name": "Example User",
"author_email": "user@example.com",
"authored_date": "2016-12-12T20:10:39.000+01:00",
"created_at": "2016-12-12T20:10:39.000+01:00",
"committer_name": "Administrator",
"committer_email": "admin@example.com",
"committed_date": "2016-12-12T20:10:39.000+01:00",
"title": "Feature added",
"message": "Feature added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
"message": "Feature added\n\nSigned-off-by: Example User <user@example.com>\n",
"parent_ids": [
"a738f717824ff53aebad8b090c1b79a14f2bd9e8"
],
Loading
Loading
Loading
Loading
@@ -22,11 +22,11 @@ Parameters:
"parent_ids": null,
"title": "Update README.md to include `Usage in testing and development`",
"message": "Update README.md to include `Usage in testing and development`",
"author_name": "Luke \"Jared\" Bennett",
"author_email": "lbennett@gitlab.com",
"author_name": "Example \"Sample\" User",
"author_email": "user@example.com",
"authored_date": "2017-04-11T10:08:59.000Z",
"committer_name": "Luke \"Jared\" Bennett",
"committer_email": "lbennett@gitlab.com",
"committer_name": "Example \"Sample\" User",
"committer_email": "user@example.com",
"committed_date": "2017-04-11T10:08:59.000Z"
}
]
Loading
Loading
@@ -57,16 +57,16 @@ POST /projects/:id/merge_requests/
[
{
"id": "6d394385cf567f80a8fd85055db1ab4c5295806f",
"message": "Added contributing guide\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
"message": "Added contributing guide\n\nSigned-off-by: Example User <user@example.com>\n",
"parent_ids": [
"1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"
],
"authored_date": "2014-02-27T10:05:10.000+02:00",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_name": "Example User",
"author_email": "user@example.com",
"committed_date": "2014-02-27T10:05:10.000+02:00",
"committer_name": "Dmitriy Zaporozhets",
"committer_email": "dmitriy.zaporozhets@gmail.com"
"committer_name": "Example User",
"committer_email": "user@example.com"
}
]
```
Loading
Loading
Loading
Loading
@@ -732,8 +732,8 @@ Parameters:
"id": "ed899a2f4b50b4370feeea94676502b42383c746",
"short_id": "ed899a2f4b5",
"title": "Replace sanitize with escape once",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dzaporozhets@sphereconsultinginc.com",
"author_name": "Example User",
"author_email": "user@example.com",
"created_at": "2012-09-20T11:50:22+03:00",
"message": "Replace sanitize with escape once"
},
Loading
Loading
@@ -741,8 +741,8 @@ Parameters:
"id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
"short_id": "6104942438c",
"title": "Sanitize for network graph",
"author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_name": "Example User",
"author_email": "user@example.com",
"created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph"
}
Loading
Loading
Loading
Loading
@@ -154,16 +154,16 @@ Response:
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b",
"title": "JS fix",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_name": "Example User",
"author_email": "user@example.com",
"created_at": "2014-02-27T10:27:00+02:00"
},
"commits": [{
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b",
"title": "JS fix",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_name": "Example User",
"author_email": "user@example.com",
"created_at": "2014-02-27T10:27:00+02:00"
}],
"diffs": [{
Loading
Loading
@@ -241,11 +241,11 @@ Example response:
"created_at": "2014-02-27T08:03:18.000Z",
"parent_ids": [],
"message": "Initial commit\n",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"author_name": "Example User",
"author_email": "user@example.com",
"authored_date": "2014-02-27T08:03:18.000Z",
"committer_name": "Dmitriy Zaporozhets",
"committer_email": "dmitriy.zaporozhets@gmail.com",
"committer_name": "Example User",
"committer_email": "user@example.com",
"committed_date": "2014-02-27T08:03:18.000Z"
}
```
Loading
Loading
@@ -4,8 +4,10 @@
 
Complementary to our [existing Jira][existing-jira] project integration, you're now able to integrate
GitLab projects with [Jira Development Panel][jira-development-panel]. Both can be used
simultaneously. This works with self-hosted GitLab or GitLab.com integrated with self-hosted Jira
or cloud Jira.
simultaneously. This works with self-managed GitLab or GitLab.com integrated with:
- Jira hosted by you.
- Cloud Jira.
 
By doing this you can easily access related GitLab merge requests, branches, and commits directly from a Jira issue.
 
Loading
Loading
@@ -19,7 +21,7 @@ Note this is different from the [existing Jira][existing-jira] project integrati
is one GitLab project to the entire Jira instance.
 
We recommend that a GitLab group admin
or instance admin (in the case of self-hosted GitLab) set up the integration,
or instance admin (in the case of self-managed GitLab) set up the integration,
in order to simplify administration.
 
TIP: **Tip:**
Loading
Loading
@@ -28,9 +30,9 @@ regular users won't impact your integration.
 
## Requirements
 
### Self-hosted GitLab
### Self-managed GitLab
 
If you are using self-hosted GitLab, make sure your GitLab instance is accessible by Jira.
If you are using self-managed GitLab, make sure your GitLab instance is accessible by Jira.
 
- If you are connecting to Jira Cloud, make sure your instance is accessible via the internet.
- If you are using Jira Server, make sure your instance is accessible however your network is set up.
Loading
Loading
Loading
Loading
@@ -46,13 +46,13 @@ sudo -u git -H bin/rails console RAILS_ENV=production
 
Then run the following command to enable the feature flag:
 
```
```ruby
Feature.enable(:sourcegraph)
```
 
You can also enable the feature flag only for specific projects with:
 
```
```ruby
Feature.enable(:sourcegraph, Project.find_by_full_path('my_group/my_project'))
```
 
Loading
Loading
Loading
Loading
@@ -64,7 +64,7 @@ To enable the Twitter OmniAuth provider you must register your application with
 
For installations from source:
 
```
```yaml
- { name: 'twitter', app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET' }
```
Loading
Loading
Loading
Loading
@@ -60,7 +60,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
 
For installation from source:
 
```
```yaml
- { name: 'ultraauth',
app_id: 'OPENID_CLIENT_ID',
app_secret: 'OPENID_CLIENT_SECRET',
Loading
Loading
Loading
Loading
@@ -36,7 +36,7 @@ The following assumes you already have Vault installed and running.
 
You should see the following output in the terminal:
 
```shell
```plaintext
Success! Enabled oidc auth method at: oidc/
```
 
Loading
Loading
@@ -113,7 +113,7 @@ The following assumes you already have Vault installed and running.
 
The terminal will output:
 
```
```plaintext
Success! You are now authenticated. The token information displayed below
is already stored in the token helper. You do NOT need to run "vault login"
again. Future Vault requests will automatically use this token.
Loading
Loading
Loading
Loading
@@ -98,7 +98,7 @@ To support importing bare repositories from hashed storage, GitLab 10.4 and
later stores the full project path with each repository, in a special section of
the Git repository's config file. This section is formatted as follows:
 
```
```ini
[gitlab]
fullpath = gitlab-org/gitlab
```
Loading
Loading
@@ -128,7 +128,7 @@ Until then, you may wish to manually migrate repositories yourself. You can use
[Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session)
to do so. In a Rails console session, run the following to migrate a project:
 
```
```ruby
project = Project.find_by_full_path('gitlab-org/gitlab')
project.write_repository_config
```
Loading
Loading
@@ -136,7 +136,7 @@ project.write_repository_config
In a Rails console session, run the following to migrate all of a namespace's
projects (this may take a while if there are 1000s of projects in a namespace):
 
```
```ruby
namespace = Namespace.find_by_full_path('gitlab-org')
namespace.send(:write_projects_repository_config)
```
Loading
Loading
@@ -446,8 +446,8 @@ X-Gitlab-Event: System Hook
"timestamp": "2013-05-13T18:18:08+00:00",
"url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428",
"author": {
"name": "Dmitriy Zaporozhets",
"email": "dmitriy.zaporozhets@gmail.com"
"name": "Example User",
"email": "user@example.com"
}
}
],
Loading
Loading
Loading
Loading
@@ -40,7 +40,7 @@ If you are using GitLab.com, see the [quick start guide](quick_start_guide.md)
for how to use Auto DevOps with GitLab.com and a Kubernetes cluster on Google Kubernetes
Engine (GKE).
 
If you are using a self-hosted instance of GitLab, you will need to configure the
If you are using a self-managed instance of GitLab, you will need to configure the
[Google OAuth2 OmniAuth Provider](../../integration/google.md) before
you can configure a cluster on GKE. Once this is set up, you can follow the steps on the
[quick start guide](quick_start_guide.md) to get started.
Loading
Loading
@@ -55,7 +55,7 @@ in multiple ways:
- Auto DevOps works with any Kubernetes cluster; you're not limited to running
on GitLab's infrastructure. (Note that many features also work without Kubernetes).
- There is no additional cost (no markup on the infrastructure costs), and you
can use a self-hosted Kubernetes cluster or Containers as a Service on any
can use a Kubernetes cluster you host or Containers as a Service on any
public cloud (for example, [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/)).
- Auto DevOps has more features including security testing, performance testing,
and code quality testing.
Loading
Loading
@@ -93,7 +93,8 @@ knowledge of the following:
Auto DevOps provides great defaults for all the stages; you can, however,
[customize](#customizing) almost everything to your needs.
 
For an overview on the creation of Auto DevOps, read the blog post [From 2/3 of the Self-Hosted Git Market, to the Next-Generation CI System, to Auto DevOps](https://about.gitlab.com/blog/2017/06/29/whats-next-for-gitlab-ci/).
For an overview on the creation of Auto DevOps, read more
[in this blog post](https://about.gitlab.com/blog/2017/06/29/whats-next-for-gitlab-ci/).
 
NOTE: **Note**
Kubernetes clusters can [be used without](../../user/project/clusters/index.md)
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ We will use GitLab's native Kubernetes integration, so you will not need
to create a Kubernetes cluster manually using the Google Cloud Platform console.
We will create and deploy a simple application that we create from a GitLab template.
 
These instructions will also work for a self-hosted GitLab instance; you'll just
These instructions will also work for a self-managed GitLab instance; you'll just
need to ensure your own [Runners are configured](../../ci/runners/README.md) and
[Google OAuth is enabled](../../integration/google.md).
 
Loading
Loading
Loading
Loading
@@ -49,7 +49,7 @@ The Web Application Firewall requires:
If you are using GitLab.com, see the [quick start guide](quick_start_guide.md) for
how to use the WAF with GitLab.com and a Kubernetes cluster on Google Kubernetes Engine (GKE).
 
If you are using a self-hosted instance of GitLab, you need to configure the
If you are using a self-managed instance of GitLab, you need to configure the
[Google OAuth2 OmniAuth Provider](../../integration/google.md) before
you can configure a cluster on GKE. Once this is set up, you can follow the steps on the [quick start guide](quick_start_guide.md) to get started.
 
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ We will use GitLab's native Kubernetes integration, so you will not need
to create a Kubernetes cluster manually using the Google Cloud Platform console.
We will create and deploy a simple application that we create from a GitLab template.
 
These instructions will also work for a self-hosted GitLab instance. However, you will
These instructions will also work for a self-managed GitLab instance. However, you will
need to ensure your own [Runners are configured](../../ci/runners/README.md) and
[Google OAuth is enabled](../../integration/google.md).
 
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/customization/branded_login_page.
 
# GitLab Appearance **(CORE ONLY)**
 
There are several options for customizing the appearance of a self hosted instance
There are several options for customizing the appearance of a self-managed instance
of GitLab. These settings are accessed from the **Admin Area** in the **Appearance**
section.
 
Loading
Loading
Loading
Loading
@@ -207,7 +207,7 @@ The `id` must be the same with what you
Replace `PROJECT_ID` with your project ID which can be found on the home page
of your project.
 
If you have a self-hosted GitLab installation, replace `gitlab.com` with your
If you have a self-managed GitLab installation, replace `gitlab.com` with your
domain name.
 
NOTE: **Note:**
Loading
Loading
@@ -260,7 +260,7 @@ The `id` must be the same with what you
Replace `my-group` with your group name and `PROJECT_ID` with your project ID
which can be found on the home page of your project.
 
If you have a self-hosted GitLab installation, replace `gitlab.com` with your
If you have a self-managed GitLab installation, replace `gitlab.com` with your
domain name.
 
NOTE: **Note:**
Loading
Loading
@@ -315,7 +315,7 @@ The `id` must be the same with what you
Replace `PROJECT_ID` with your project ID which can be found on the home page
of your project.
 
If you have a self-hosted GitLab installation, replace `gitlab.com` with your
If you have a self-managed GitLab installation, replace `gitlab.com` with your
domain name.
 
NOTE: **Note:**
Loading
Loading
Loading
Loading
@@ -127,7 +127,7 @@ npm config set '//gitlab.com/api/v4/packages/npm/:_authToken' "<your_token>"
Replace `<your_project_id>` with your project ID which can be found on the home page
of your project and `<your_token>` with your personal access token.
 
If you have a self-hosted GitLab installation, replace `gitlab.com` with your
If you have a self-managed GitLab installation, replace `gitlab.com` with your
domain name.
 
You should now be able to download and upload NPM packages to your project.
Loading
Loading
@@ -185,7 +185,7 @@ for NPM. To do this, add the following section to the bottom of `package.json`:
Replace `<your_project_id>` with your project ID, which can be found on the home
page of your project, and replace `@foo` with your own scope.
 
If you have a self-hosted GitLab installation, replace `gitlab.com` with your
If you have a self-managed GitLab installation, replace `gitlab.com` with your
domain name.
 
Once you have enabled it and set up [authentication](#authenticating-to-the-gitlab-npm-registry),
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment