summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Standardise style for page.docs/variables-docEvan Read2018-10-041-6/+6
* Fix documentation for variablesEvan Read2018-10-021-3/+5
* Merge branch 'add-gl-link-to-download-viewer' into 'master'Clement Ho2018-10-012-2/+9
|\
| * Add link component to download viewer componentGeorge Tsiolis2018-10-012-2/+9
|/
* Merge branch 'add-gl-link-to-user-avatar-link' into 'master'Clement Ho2018-10-012-2/+9
|\
| * Add link component to user avatar link componentGeorge Tsiolis2018-10-012-2/+9
|/
* Merge branch '23197-add-custom-header-for-error-responses' into 'master'Stan Hu2018-10-013-0/+91
|\
| * Add custom header for error responsesDavid2018-10-013-0/+91
|/
* Merge branch 'variables_in_events' into 'master'Kamil Trzciński2018-10-016-17/+59
|\
| * Add variables on pipeline webhookPierre Tardy2018-10-016-17/+59
|/
* Merge branch 'improve-empty-project-placeholder' into 'master'Annabel Dunstone Gray2018-10-012-1/+6
|\
| * Improve empty project placeholder for non-members and members without write a...George Tsiolis2018-09-282-1/+6
* | Merge remote-tracking branch 'dev/master'Bob Van Landuyt2018-10-0148-70/+622
|\ \
| * \ Merge branch 'security-2697-code-highlight-timeout' into 'master'Bob Van Landuyt2018-10-013-1/+35
| |\ \
| | * | Fix syntax highlight taking too longMark Chao2018-09-033-1/+35
| * | | Merge branch 'security-acet-issue-details' into 'master'Bob Van Landuyt2018-10-015-4/+47
| |\ \ \
| | * | | Properly sanitize JSON data to fix XSS on Issue details page.Fatih Acet2018-09-115-4/+47
| * | | | Merge branch 'security-package-json-xss' into 'master'Bob Van Landuyt2018-10-013-5/+24
| |\ \ \ \
| | * | | | Fix xss vulnerability sourced from package.json's homepageMark Chao2018-09-193-5/+24
| * | | | | Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-...Bob Van Landuyt2018-10-0120-45/+160
| |\ \ \ \ \
| | * | | | | Ports new refactor from EE to CETiago Botelho2018-09-245-5/+17
| | * | | | | Applies the CE backport of EE#657Tiago Botelho2018-09-2417-40/+143
| * | | | | | Merge branch 'security-fj-stored-xss-in-repository-imports' into 'master'Bob Van Landuyt2018-10-015-2/+80
| |\ \ \ \ \ \
| | * | | | | | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-015-2/+80
| |/ / / / / /
| * | | | | | Merge branch 'security-gcp-token-exposed-by-kubernetes' into 'master'Bob Van Landuyt2018-10-014-9/+9
| |\ \ \ \ \ \
| | * | | | | | Do not persist errors from Kubernetes callsMayra Cabrera2018-09-174-9/+9
| * | | | | | | Merge branch 'fix-events-finder-incomplete' into 'master'Bob Van Landuyt2018-10-017-4/+231
| |\ \ \ \ \ \ \
| | * | | | | | | Add changelogNick Thomas2018-09-211-0/+5
| | * | | | | | | Check snippet note event visibilityNick Thomas2018-09-212-0/+99
| | * | | | | | | Fix Event#visible_to_user? for milestonesNick Thomas2018-09-212-1/+38
| | * | | | | | | Redact events shown in the events APINick Thomas2018-09-214-3/+89
| * | | | | | | | Update CHANGELOG.md for 11.3.1GitLab Release Tools Bot2018-09-261-0/+12
| * | | | | | | | Update CHANGELOG.md for 11.1.7GitLab Release Tools Bot2018-09-261-0/+12
| * | | | | | | | Update CHANGELOG.md for 11.2.4GitLab Release Tools Bot2018-09-261-0/+12
* | | | | | | | | Merge branch 'lib-api-frozen-string-enable' into 'master'Rémy Coutable2018-10-01103-9/+207
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable frozen string in lib/api and lib/backupgfyoung2018-09-29103-9/+207
* | | | | | | | | | Merge branch '51021-more-attr-encrypted' into 'master'Rémy Coutable2018-10-0110-0/+290
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate sensitive web hook data in the backgroundNick Thomas2018-10-015-0/+216
| * | | | | | | | | | Encrypt webhook tokens and URLs in the databaseNick Thomas2018-10-015-0/+74
* | | | | | | | | | | Merge branch '45453-fix-delete-protected-branch-btn' into 'master'Filipa Lacerda2018-10-012-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes modal button alignmentJacopo2018-10-012-1/+6
* | | | | | | | | | | | Merge branch 'update-configuration-section' into 'master'Achilleas Pipinellis2018-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add info about reverse proxy to the configuration sectionupdate-configuration-sectionAlexander Tanayno2018-09-281-1/+1
* | | | | | | | | | | | | Merge branch 'feature/set-public-email-through-api' into 'master'Rémy Coutable2018-10-016-22/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add changelogsAlexis Reigel2018-10-012-0/+10
| * | | | | | | | | | | | | allow users api to set public_emailAlexis Reigel2018-10-014-21/+26
| * | | | | | | | | | | | | add missing allowed attributesAlexis Reigel2018-10-012-1/+45
| * | | | | | | | | | | | | remove obsolete parameter from users apiAlexis Reigel2018-09-261-1/+0
| * | | | | | | | | | | | | remove obsolete allowed attributeAlexis Reigel2018-09-261-1/+0
* | | | | | | | | | | | | | Merge branch 'update-link-to-documentation-testing' into 'master'Achilleas Pipinellis2018-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \