Skip to content
Snippets Groups Projects
Unverified Commit 5de85992 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Merge branch 'master' into vue-mr-widget-state

* master:
  Split the setup-test-env job in two
  Remove the wait time for the login form check
  Fix protected branches API to accept name parameter with dot
  Update outdated docs for CI/CD quick start
  _never_ unset gitlab.full_path
  Backport to match EE icons
  Add horizontal scroll to wiki tables
  Update best_practices.md Remove duplicate list item in "General Guidelines" Section.
  Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController
  Move rugged-call from Project#write_repository_config to Git::Repository#write_config
  doc: Spelling fixes
  Update Auto DevOps template
  Disable scss-lint around text-decoration-skip
  Add text-decoration-skip: ink to all underlined elements
  Fix Shows signin tab after new user email confirmation
  Fixes mistake in change log doc.
parents de6c27f6 68cc9ea2
No related branches found
No related tags found
No related merge requests found
Showing
with 41 additions and 21 deletions
---
title: Improve readability of underlined links for dyslexic users
merge_request:
author:
type: other
---
title: Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController
merge_request:
author:
type: fixed
---
title: Fix protected branches API to accept name parameter with dot
merge_request:
author:
type: fixed
---
title: Add horizontal scroll to wiki tables
merge_request: 16527
author: George Tsiolis
type: fixed
Loading
Loading
@@ -144,7 +144,7 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
1. [Reconfigure][reconf] or [restart] GitLab for Omnibus and installations
from source respectively for the changes to take effect.
 
You might want to try this out on a incognito browser window.
You might want to try this out on an incognito browser window.
 
## Configuring groups
 
Loading
Loading
Loading
Loading
@@ -483,7 +483,7 @@ You can use GitLab as an auth endpoint and use a non-bundled Container Registry.
1. A certificate keypair is required for GitLab and the Container Registry to
communicate securely. By default omnibus-gitlab will generate one keypair,
which is saved to `/var/opt/gitlab/gitlab-rails/etc/gitlab-registry.key`.
When using an non-bundled Container Registry, you will need to supply a
When using a non-bundled Container Registry, you will need to supply a
custom certificate key. To do that, add the following to
`/etc/gitlab/gitlab.rb`
 
Loading
Loading
Loading
Loading
@@ -154,7 +154,7 @@ who will take all the decisions to restore the service availability by:
- Reconfigure the old **Master** and demote to **Slave** when it comes back online
 
You must have at least `3` Redis Sentinel servers, and they need to
be each in a independent machine (that are believed to fail independently),
be each in an independent machine (that are believed to fail independently),
ideally in different geographical areas.
 
You can configure them in the same machines where you've configured the other
Loading
Loading
Loading
Loading
@@ -172,7 +172,7 @@ Parameters:
| --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
| `issue_iid` | integer | yes | The internal ID of an issue |
| `award_id` | integer | yes | The ID of a award_emoji |
| `award_id` | integer | yes | The ID of an award_emoji |
 
```bash
curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/344
Loading
Loading
@@ -197,7 +197,7 @@ Parameters:
| --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
| `issue_iid` | integer | yes | The internal ID of an issue |
| `note_id` | integer | yes | The ID of an note |
| `note_id` | integer | yes | The ID of a note |
 
 
```bash
Loading
Loading
@@ -323,7 +323,7 @@ Parameters:
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
| `issue_iid` | integer | yes | The internal ID of an issue |
| `note_id` | integer | yes | The ID of a note |
| `award_id` | integer | yes | The ID of a award_emoji |
| `award_id` | integer | yes | The ID of an award_emoji |
 
```bash
curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/1/issues/80/award_emoji/345
Loading
Loading
Loading
Loading
@@ -73,7 +73,7 @@ POST /groups/:id/milestones
Parameters:
 
- `id` (required) - The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user
- `title` (required) - The title of an milestone
- `title` (required) - The title of a milestone
- `description` (optional) - The description of the milestone
- `due_date` (optional) - The due date of the milestone
- `start_date` (optional) - The start date of the milestone
Loading
Loading
Loading
Loading
@@ -591,7 +591,7 @@ PUT /projects/:id/merge_requests/:merge_request_iid
| `title` | string | no | Title of MR |
| `assignee_id` | integer | no | The ID of the user to assign the merge request to. Set to `0` or provide an empty value to unassign all assignees. |
| `milestone_id` | integer | no | The ID of a milestone to assign the merge request to. Set to `0` or provide an empty value to unassign a milestone.|
| `labels` | string | no | Comma-separated label names for an merge request. Set to an empty string to unassign all labels. |
| `labels` | string | no | Comma-separated label names for a merge request. Set to an empty string to unassign all labels. |
| `description` | string | no | Description of MR |
| `state_event` | string | no | New state (close/reopen) |
| `remove_source_branch` | boolean | no | Flag indicating if a merge request should remove the source branch when merging |
Loading
Loading
Loading
Loading
@@ -70,7 +70,7 @@ POST /projects/:id/milestones
Parameters:
 
- `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user
- `title` (required) - The title of an milestone
- `title` (required) - The title of a milestone
- `description` (optional) - The description of the milestone
- `due_date` (optional) - The due date of the milestone
- `start_date` (optional) - The start date of the milestone
Loading
Loading
Loading
Loading
@@ -158,7 +158,7 @@ Parameters:
 
- `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user
- `snippet_id` (required) - The ID of a project snippet
- `note_id` (required) - The ID of an snippet note
- `note_id` (required) - The ID of a snippet note
 
```json
{
Loading
Loading
Loading
Loading
@@ -982,7 +982,7 @@ Example response:
## Unarchive a project
 
Unarchives the project if the user is either admin or the project owner of this project. This action is
idempotent, thus unarchiving an non-archived project will not change the project.
idempotent, thus unarchiving a non-archived project will not change the project.
 
```
POST /projects/:id/unarchive
Loading
Loading
Loading
Loading
@@ -455,7 +455,7 @@ Mappings are defined as entries in the root YAML array, and are identified by a
- Literal periods (`.`) should be escaped as `\.`.
- `public`
- a string, starting and ending with `'`.
- Can include `\N` expressions to refer to capture groups in the `source` regular expression in order of their occurence, starting with `\1`.
- Can include `\N` expressions to refer to capture groups in the `source` regular expression in order of their occurrence, starting with `\1`.
 
The public path for a source path is determined by finding the first `source` expression that matches it, and returning the corresponding `public` path, replacing the `\N` expressions with the values of the `()` capture groups if appropriate.
 
Loading
Loading
Loading
Loading
@@ -167,7 +167,7 @@ Finally, push to GitLab and let the tests begin!
### Test against different PHP versions in Shell builds
 
The [phpenv][] project allows you to easily manage different versions of PHP
each with its own config. This is specially usefull when testing PHP projects
each with its own config. This is especially useful when testing PHP projects
with the Shell executor.
 
You will have to install it on your build machine under the `gitlab-runner`
Loading
Loading
@@ -227,7 +227,7 @@ following in your `.gitlab-ci.yml`:
...
 
# Composer stores all downloaded packages in the vendor/ directory.
# Do not use the following if the vendor/ directory is commited to
# Do not use the following if the vendor/ directory is committed to
# your git repository.
cache:
paths:
Loading
Loading
Loading
Loading
@@ -42,7 +42,7 @@ production:
This project has three jobs:
1. `test` - used to test Django application,
2. `staging` - used to automatically deploy staging environment every push to `master` branch
3. `production` - used to automatically deploy production environmnet for every created tag
3. `production` - used to automatically deploy production environment for every created tag
 
## Store API keys
 
Loading
Loading
Loading
Loading
@@ -135,9 +135,9 @@ Clicking on it you will be directed to the jobs page for that specific commit.
 
![Single commit jobs page](img/single_commit_status_pending.png)
 
Notice that there are two jobs pending which are named after what we wrote in
`.gitlab-ci.yml`. The red triangle indicates that there is no Runner configured
yet for these jobs.
Notice that there is a pending job which is named after what we wrote in
`.gitlab-ci.yml`. "stuck" indicates that there is no Runner configured
yet for this job.
 
The next step is to configure a Runner so that it picks the pending jobs.
 
Loading
Loading
Loading
Loading
@@ -194,7 +194,7 @@ before_script:
 
##
## You can optionally disable host key checking. Be aware that by adding that
## you are suspectible to man-in-the-middle attacks.
## you are susceptible to man-in-the-middle attacks.
## WARNING: Use this only with the Docker executor, if you use it with shell
## you will overwrite your user's SSH config.
##
Loading
Loading
Loading
Loading
@@ -87,7 +87,7 @@ future GitLab releases.**
 
## 9.0 Renaming
 
To follow conventions of naming across GitLab, and to futher move away from the
To follow conventions of naming across GitLab, and to further move away from the
`build` term and toward `job` CI variables have been renamed for the 9.0
release.
 
Loading
Loading
Loading
Loading
@@ -61,7 +61,7 @@ against EE.
1. Tries to apply it to current EE `master`
1. If it applies cleanly, the job succeeds
 
In the case where the job fails, it means you should create a `ee-<ce_branch>`
In the case where the job fails, it means you should create an `ee-<ce_branch>`
or `<ce_branch>-ee` branch, push it to EE and open a merge request against EE
`master`.
At this point if you retry the failing job in your CE merge request, it should
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