summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /changelogs
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/archive-10.md2
-rw-r--r--changelogs/archive.md2
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.