diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 15:09:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 15:09:48 +0000 |
| commit | f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d (patch) | |
| tree | 7ae3da76e824c435167dd108721c0124ad2ee484 /changelogs | |
| parent | 2dedd78ef505a0ab0a379c7340a3fcba56ada663 (diff) | |
| download | gitlab-ce-f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/archive-10.md | 2 | ||||
| -rw-r--r-- | changelogs/archive.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changelogs/archive-10.md b/changelogs/archive-10.md index fcc15dc9d74..5b9cfe516e9 100644 --- a/changelogs/archive-10.md +++ b/changelogs/archive-10.md @@ -32,7 +32,7 @@ ### Performance (1 change) -- Memoize Gitlab::Database.version. +- Memoize Gitlab::Database.main.version. ## 10.8.2 (2018-05-28) diff --git a/changelogs/archive.md b/changelogs/archive.md index b8ebf4cc0d9..364fa12af09 100644 --- a/changelogs/archive.md +++ b/changelogs/archive.md @@ -2006,7 +2006,7 @@ - Don't delete assigned MRs/issues when user is deleted. - Remove new branch button for confidential issues. - Don't allow project guests to subscribe to merge requests through the API. (Robert Schilling) -- Don't connect in Gitlab::Database.adapter_name. +- Don't connect in Gitlab::Database.main.adapter_name. - Prevent users from creating notes on resources they can't access. - Ignore encrypted attributes in Import/Export. - Change rspec test to guarantee window is resized before visiting page. |