diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-12 10:50:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-12 10:50:32 +0000 |
| commit | ab7342406256ab5f04d40af496ef014d7c525389 (patch) | |
| tree | 57206fc6ba8e7cf2f8da4500b52d0303c40b7507 /lib/api/api.rb | |
| parent | 853c80a9f72219d327fba1b92b539871086a08c9 (diff) | |
| parent | cc68b0dfb1bfad9347d47f063d525504aa0501c4 (diff) | |
| download | gitlab-ce-ab7342406256ab5f04d40af496ef014d7c525389.tar.gz | |
[ci skip] Merge branch 'master' into 42923-close-issue
* master: (21 commits)
GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP)
Return a warning string if we try to encode to unsupported encoding
Remove confirmation_input
Resolve failures in GitHub-ish import controller specs
Remove changelogs for already-released security patches
Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'
Merge branch 'fix/gh-namespace-issue' into 'security-10-4'
Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4'
Merge branch 'fix-mermaid-xss' into 'security-10-4'
Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'
API - fix searching in group/project specified by path
Add documentation on how to build a QA Docker image
Fix english in style_guide_js.md
Adds tooltip for environment name Adds CSS for child envrionments
Do not attach runner to a non-exsiting network in QA
Remove not needed default statement
Improve docs about allowing some side effects on the constructor
Move all ENV to Runtime::Env
Rename .scss files to use snake_case
Moves missing branch into a vue file
...
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions