diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 15:10:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 15:10:35 +0000 |
| commit | 7172fb10313a9a7790f8e033b347e77df4987154 (patch) | |
| tree | fe1fda5411240ba303bdd1032d12a94ccd58c27c /changelogs | |
| parent | 793d974d7c4bd8c9cbd437a9e35087092f4e8bea (diff) | |
| download | gitlab-ce-7172fb10313a9a7790f8e033b347e77df4987154.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
4 files changed, 5 insertions, 15 deletions
diff --git a/changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml b/changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml deleted file mode 100644 index 6e04471fa13..00000000000 --- a/changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Omit trailing slash when checking allowed requests in the read-only middleware -merge_request: 61641 -author: -type: fixed diff --git a/changelogs/unreleased/id-rename-main-to-master-in-views.yml b/changelogs/unreleased/id-rename-main-to-master-in-views.yml new file mode 100644 index 00000000000..7e3f45274f1 --- /dev/null +++ b/changelogs/unreleased/id-rename-main-to-master-in-views.yml @@ -0,0 +1,5 @@ +--- +title: Rename master to main in views placeholders +merge_request: 61252 +author: +type: changed diff --git a/changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml b/changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml deleted file mode 100644 index 3bea1874ff3..00000000000 --- a/changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Omit trailing slash when proxying pre-authorized routes with no suffix -merge_request: 61638 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml b/changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml deleted file mode 100644 index ebaf2aee123..00000000000 --- a/changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix N+1 SQL queries in PipelinesController#show -merge_request: 60794 -author: -type: fixed |