summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Empty commit43-43-stableRobert Speicher2019-12-110-0/+0
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-105-2/+12
* Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stableGitLab Release Tools Bot2019-12-103-2/+19
|\
| * Update VERSION to 12.5.4v12.5.4GitLab Release Tools Bot2019-12-091-1/+1
| * Update CHANGELOG.md for 12.5.4GitLab Release Tools Bot2019-12-091-0/+4
| * Merge branch 'security-37766-transfer-group-reindex-ce-12-5' into '12-5-stable'Alessio Caiazza2019-12-091-1/+14
| |\ |/ /
| * Trigger Elasticsearch indexing when public group moved to privateDylan Griffith2019-12-061-1/+14
|/
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-054-4/+5
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-032-1/+12
* Update VERSION to 12.5.3v12.5.3GitLab Release Tools Bot2019-12-031-1/+1
* Update CHANGELOG.md for 12.5.3GitLab Release Tools Bot2019-12-036-25/+14
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-0346-171/+477
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-11-272-1/+5
* Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stableGitLab Release Tools Bot2019-11-273-6/+8
|\
| * Update VERSION to 12.5.2v12.5.2GitLab Release Tools Bot2019-11-271-1/+1
| * Update CHANGELOG.md for 12.5.2GitLab Release Tools Bot2019-11-272-5/+7
|/
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-11-274-4/+22
* Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stableGitLab Release Tools Bot2019-11-2753-269/+1242
|\
| * Merge branch 'security-dos-issue-and-commit-comments-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-263-1/+11
| |\
| | * Fix invalid byte sequencePatrick Derichs2019-11-223-1/+11
| * | Update VERSION to 12.5.1v12.5.1GitLab Release Tools Bot2019-11-261-1/+1
| * | Update CHANGELOG.md for 12.5.1GitLab Release Tools Bot2019-11-269-41/+14
| * | Merge branch 'security-29660-update-dependencies-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-263-2/+7
| |\ \
| | * | Update Workhorse and Gitaly to fix a security issueNick Thomas2019-11-213-2/+7
| * | | Merge branch 'security-aws-secret-key-2937-ce-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-261-0/+1
| |\ \ \
| | * | | Hide AWS secret on Admin Integration pageJustin Ho Tuan Duong2019-11-261-0/+1
| |/ / /
| * | | Merge branch 'security-ag-cycle-analytics-guest-permissions-12-5' into '12-5-...GitLab Release Tools Bot2019-11-266-6/+64
| |\ \ \
| | * | | Ensure that summary items remain alignedBrandon Labuschagne2019-11-202-2/+8
| | * | | Prevent guests from seeing commits for cycle analyticsAakriti Gupta2019-11-204-4/+56
| * | | | Merge branch 'security-filter-related-branches-from-activity-feed-12.5' into ...GitLab Release Tools Bot2019-11-264-1/+121
| |\ \ \ \
| | * | | | Restrict branches visible to guests in Issue feedKerri Miller2019-11-204-1/+121
| * | | | | Merge branch 'security-2943-encrypt-plaintext-tokens-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-267-29/+239
| |\ \ \ \ \
| | * | | | | Encrypt application settings with pre and post deploymentsArturo Herrero2019-11-256-83/+31
| | * | | | | Encrypt application setting tokensArturo Herrero2019-11-217-23/+285
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'security-dns-rebind-ssrf-in-slack-notifications-12-5-ce' into '...GitLab Release Tools Bot2019-11-2612-181/+294
| |\ \ \ \ \
| | * | | | | Use Gitlab::HTTP for all chat notificationsHordur Freyr Yngvason2019-11-2112-181/+294
| | |/ / / /
| * | | | | Merge branch 'security-33712-ce-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-267-18/+342
| |\ \ \ \ \
| | * | | | | Add search_helpers changes from security-33712Dylan Griffith2019-11-221-0/+6
| | * | | | | Fix group created from other test from pollutingMark Chao2019-11-221-2/+2
| | * | | | | Test admin for search accessibilityMark Chao2019-11-222-0/+36
| | * | | | | Internalize private project minimum access levelMark Chao2019-11-223-12/+37
| | * | | | | Fix scope to handle private guest permissionMark Chao2019-11-223-1/+88
| | * | | | | ES: update permission spec tableMark Chao2019-11-222-15/+185
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'security-fix-xss-in-label-namespace-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-263-1/+15
| |\ \ \ \ \
| | * | | | | Escape namespace in label referencesHeinrich Lee Yu2019-11-253-1/+15
| |/ / / / / |/| | | | |
| * | | | | Merge branch 'security-28802-respect-fork-parent-visibility-12-5' into '12-5-...GitLab Release Tools Bot2019-11-2610-27/+164
| |\ \ \ \ \
| | * | | | | Check permissions before showing a forked project's sourceNick Thomas2019-11-2510-27/+164
| |/ / / / / |/| | | | |
| * | | | | Merge branch 'security-exclude_ids_attribute_cleaning-12-5-ce' into '12-5-sta...GitLab Release Tools Bot2019-11-263-2/+10
| |\ \ \ \ \ |/ / / / / /
| * | | | | Spec to ensure `_ids` are cleaned by ImportExport::AttributeCleanerImre Farkas2019-11-262-1/+9
| * | | | | Ensure attributes that end in `_ids` are cleanedDJ Mountney2019-11-261-1/+1
|/ / / / /