summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-28 00:07:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-28 00:07:51 +0000
commitbba3aae6262b45e5457d0fcaa23e99f815114b4b (patch)
tree9510a08bba9514faf620b4244f382c4fc9599637 /changelogs
parentf50b93c373428d624cc2cabe98e4022dce846e67 (diff)
downloadgitlab-ce-bba3aae6262b45e5457d0fcaa23e99f815114b4b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/196226-rightsidebar-collapsed-always-on-scrollbar.yml5
-rw-r--r--changelogs/unreleased/212526-oauth-orphan-check.yml5
-rw-r--r--changelogs/unreleased/dockerfile_swift_template.yml5
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/196226-rightsidebar-collapsed-always-on-scrollbar.yml b/changelogs/unreleased/196226-rightsidebar-collapsed-always-on-scrollbar.yml
new file mode 100644
index 00000000000..8c4623579cf
--- /dev/null
+++ b/changelogs/unreleased/196226-rightsidebar-collapsed-always-on-scrollbar.yml
@@ -0,0 +1,5 @@
+---
+title: Fix right sidebar when scrollbars are always visible
+merge_request: 27314
+author: Shawn @CasualBot
+type: fixed
diff --git a/changelogs/unreleased/212526-oauth-orphan-check.yml b/changelogs/unreleased/212526-oauth-orphan-check.yml
new file mode 100644
index 00000000000..1f473f734ae
--- /dev/null
+++ b/changelogs/unreleased/212526-oauth-orphan-check.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Gitlab::Auth to handle orphaned oauth tokens
+merge_request: 28159
+author:
+type: fixed
diff --git a/changelogs/unreleased/dockerfile_swift_template.yml b/changelogs/unreleased/dockerfile_swift_template.yml
new file mode 100644
index 00000000000..7c5d5357637
--- /dev/null
+++ b/changelogs/unreleased/dockerfile_swift_template.yml
@@ -0,0 +1,5 @@
+---
+title: "Add Swift Dockerfile to GitLab templates"
+merge_request: 28035
+author:
+type: added