summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Add latest changes from gitlab-org/gitlab@12-6-stable-eeGitLab Bot2019-12-271-9/+0
|
* Merge commit 'f688c398eab3f00a9a72245aa8ca4f7c58cedf5d' into 12-6-stablev12.6.0John T Skarbek2019-12-200-0/+0
|\
| * Update VERSION to 12.6.0GitLab Release Tools Bot2019-12-201-1/+1
| |
| * Update CHANGELOG.md for 12.6.0GitLab Release Tools Bot2019-12-20361-1809/+387
| | | | | | [ci skip]
* | Add latest changes from gitlab-org/gitlab@12-6-stable-eeGitLab Bot2019-12-20365-1810/+484
|/
* Add latest changes from gitlab-org/security/gitlab@12-6-stable-eeGitLab Bot2019-12-202-0/+0
|
* Add latest changes from gitlab-org/gitlab@12-6-stable-eeGitLab Bot2019-12-204-2/+2
|
* Update VERSION to 12.6.0-rc42v12.6.0-rc42GitLab Release Tools Bot2019-12-201-1/+1
|
* Add latest changes from gitlab-org/gitlab@12-6-stable-eeGitLab Bot2019-12-203554-153436/+68258
|
* Update VERSION to 12.5.5v12.5.5John T Skarbek2019-12-161-1/+1
|
* Update CHANGELOG.md for 12.5.5John T Skarbek2019-12-161-0/+1
| | | [ci skip]
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-166-16/+17
|
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-1613-28/+72
|
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-12-163-1/+1
|
* 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
| | | | | | [ci skip]
| * 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 private See merge request gitlab/gitlabhq!3577
| * Trigger Elasticsearch indexing when public group moved to privateDylan Griffith2019-12-061-1/+14
|/ | | | | | This fixes https://gitlab.com/gitlab-org/gitlab/issues/37766 which is caused by the fact that we leave the stale permissions data in the index after a group is moved to another group.
* 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
| | | [ci skip]
* 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
|/ | | [ci skip]
* 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 sequence See merge request gitlab/gitlabhq!3547
| | * 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
| | | | | | | | | [ci skip]
| * | 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 issue See merge request gitlab/gitlabhq!3531
| | * | 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 page See merge request gitlab/gitlabhq!3532
| | * | | 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 ↵GitLab Release Tools Bot2019-11-266-6/+64
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12-5-stable' Prevent guests from seeing commits for cycle analytics See merge request gitlab/gitlabhq!3534
| | * | | Ensure that summary items remain alignedBrandon Labuschagne2019-11-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default number of items is 3. If this is not the case, then increase the column width of the summary items to cater for 2 items plus the date filter.
| | * | | Prevent guests from seeing commits for cycle analyticsAakriti Gupta2019-11-204-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | - if the user has access level lower than REPORTER, don't include commit count in summary
| * | | | Merge branch 'security-filter-related-branches-from-activity-feed-12.5' into ↵GitLab Release Tools Bot2019-11-264-1/+121
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12-5-stable' Related Branches Visible to Guests in Issue Activity See merge request gitlab/gitlabhq!3538
| | * | | | Restrict branches visible to guests in Issue feedKerri Miller2019-11-204-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes related to branch creation should not be shown in an issue's activity feed when the user doesn't have access to :download_code.
| * | | | | Merge branch 'security-2943-encrypt-plaintext-tokens-12-5' into '12-5-stable'GitLab Release Tools Bot2019-11-267-29/+239
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab stores AWS, Slack, Askimet, reCaptcha tokens in plaintext See merge request gitlab/gitlabhq!3543
| | * | | | | Encrypt application settings with pre and post deploymentsArturo Herrero2019-11-256-83/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had concerns about the cached values on Redis with the previous two releases strategy: First release (this commit): - Create new encrypted fields in the database. - Start populating new encrypted fields, read the encrypted fields or fallback to the plaintext fields. - Backfill the data removing the plaintext fields to the encrypted fields. Second release: - Remove the virtual attribute (created in step 2). - Drop plaintext columns from the database (empty columns after step 3). We end up with a better strategy only using migration scripts in one release: - Pre-deployment migration: Add columns required for storing encrypted values. - Pre-deployment migration: Store the encrypted values in the new columns. - Post-deployment migration: Remove the old unencrypted columns
| | * | | | | Encrypt application setting tokensArturo Herrero2019-11-217-23/+285
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the plan to encrypt the plaintext tokens: First release (this commit): 1. Create new encrypted fields in the database. 2. Start populating new encrypted fields, read the encrypted fields or fallback to the plaintext fields. 3. Backfill the data removing the plaintext fields to the encrypted fields. Second release: 4. Remove the virtual attribute (created in step 2). 5. Drop plaintext columns from the database (empty columns after step 3).
| * | | | | Merge branch 'security-dns-rebind-ssrf-in-slack-notifications-12-5-ce' into ↵GitLab Release Tools Bot2019-11-2612-181/+294
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12-5-stable' Use Gitlab::HTTP for all chat notifications See merge request gitlab/gitlabhq!3544
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix private comment Elasticsearch leak See merge request gitlab/gitlabhq!3546
View Lorry Controller Status