summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'dev/12-4-stable' into 12-4-stable12-4-stableGitLab Release Tools Bot2020-01-1310-18/+103
|\
| * Update VERSION to 12.4.8v12.4.8GitLab Release Tools Bot2020-01-131-1/+1
| * Update CHANGELOG.md for 12.4.8GitLab Release Tools Bot2020-01-132-5/+7
| * Add latest changes from gitlab-org/security/gitlab@12-4-stable-eeGitLab Bot2020-01-1010-18/+101
|/
* Merge remote-tracking branch 'dev/12-4-stable' into 12-4-stableGitLab Release Tools Bot2020-01-0229-202/+392
|\
| * Update VERSION to 12.4.7v12.4.7GitLab Release Tools Bot2020-01-021-1/+1
| * Update CHANGELOG.md for 12.4.7GitLab Release Tools Bot2020-01-026-25/+11
| * Add latest changes from gitlab-org/security/gitlab@12-4-stable-eeGitLab Bot2019-12-3132-201/+405
|/
* Add latest changes from gitlab-org/gitlab@12-4-stable-eeGitLab Bot2019-12-164-3/+13
* Merge remote-tracking branch 'dev/12-4-stable' into 12-4-stableGitLab Release Tools Bot2019-12-103-2/+21
|\
| * Update VERSION to 12.4.6v12.4.6GitLab Release Tools Bot2019-12-091-1/+1
| * Update CHANGELOG.md for 12.4.6GitLab Release Tools Bot2019-12-091-0/+4
| * Merge branch 'security-37766-transfer-group-reindex-ce-12-4' into '12-4-stable'Alessio Caiazza2019-12-091-1/+16
| |\ |/ /
| * Trigger Elasticsearch indexing when public group moved to privateDylan Griffith2019-12-061-1/+16
|/
* Add latest changes from gitlab-org/gitlab@12-4-stable-eeGitLab Bot2019-12-066-8/+34
* Merge remote-tracking branch 'dev/12-4-stable' into 12-4-stableGitLab Release Tools Bot2019-11-272-1/+5
|\
| * Update VERSION to 12.4.5v12.4.5GitLab Release Tools Bot2019-11-271-1/+1
| * Update CHANGELOG.md for 12.4.5GitLab Release Tools Bot2019-11-271-0/+4
|/
* Merge remote-tracking branch 'dev/12-4-stable' into 12-4-stableGitLab Release Tools Bot2019-11-2752-263/+1237
|\
| * Update VERSION to 12.4.4v12.4.4GitLab Release Tools Bot2019-11-261-1/+1
| * Update CHANGELOG.md for 12.4.4GitLab Release Tools Bot2019-11-2610-46/+15
| * Merge branch 'security-dos-issue-and-commit-comments-12-4' into '12-4-stable'GitLab Release Tools Bot2019-11-263-1/+11
| |\
| | * Fix invalid byte sequencePatrick Derichs2019-11-223-1/+11
| * | Merge branch 'security-29660-update-dependencies-12-4' into '12-4-stable'GitLab Release Tools Bot2019-11-263-2/+7
| |\ \
| | * | Update Workhorse and Gitaly to fix a security issueNick Thomas2019-11-203-2/+7
| | |/
| * | Merge branch 'security-dns-rebind-ssrf-in-slack-notifications-12-4-ce' into '...GitLab Release Tools Bot2019-11-2612-181/+294
| |\ \
| | * | Use Gitlab::HTTP for all chat notificationsHordur Freyr Yngvason2019-11-0412-181/+294
| * | | Merge branch 'security-33712-ce-12-4' into '12-4-stable'GitLab Release Tools Bot2019-11-267-18/+342
| |\ \ \
| | * | | Add search_helpers changes from security-33712Dylan Griffith2019-11-151-0/+6
| | * | | Fix group created from other test from pollutingMark Chao2019-11-151-2/+2
| | * | | Test admin for search accessibilityMark Chao2019-11-152-0/+36
| | * | | Internalize private project minimum access levelMark Chao2019-11-153-12/+37
| | * | | Fix scope to handle private guest permissionMark Chao2019-11-153-1/+88
| | * | | ES: update permission spec tableMark Chao2019-11-152-15/+185
| * | | | Merge branch 'security-aws-secret-key-2937-ce-12-4' into '12-4-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-4' into '12-4-...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.4' 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-4' into '12-4-stable'GitLab Release Tools Bot2019-11-267-23/+238
| |\ \ \ \
| | * | | | Encrypt application settings with pre and post deploymentsArturo Herrero2019-11-256-83/+31
| | * | | | Encrypt application setting tokensArturo Herrero2019-11-217-17/+284
| | |/ / /
| * | | | Merge branch 'security-fix-xss-in-label-namespace-12-4' into '12-4-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-4' into '12-4-...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-4-ce' into '12-4-sta...GitLab Release Tools Bot2019-11-263-2/+10
| |\ \ \ \ |/ / / / /
| * | | | Spec to ensure `_ids` are cleaned by ImportExport::AttributeCleanerImre Farkas2019-11-262-1/+9