diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 12:08:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 12:08:44 +0000 |
commit | db24ab2b72dbff24c201410a0561e929ae7e8061 (patch) | |
tree | 67297286aad8cc590ae325330a0bfe1e2a7e51dc /changelogs | |
parent | 7e8278c0f46cf6058efad5afd0aef177977bd663 (diff) | |
download | gitlab-ce-db24ab2b72dbff24c201410a0561e929ae7e8061.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/199034-nomethoderror-undefined-method-unsubscribe-for-nil-nilclass.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/nfriend-31374-fix-permalink-button.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/199034-nomethoderror-undefined-method-unsubscribe-for-nil-nilclass.yml b/changelogs/unreleased/199034-nomethoderror-undefined-method-unsubscribe-for-nil-nilclass.yml new file mode 100644 index 00000000000..a63be414b84 --- /dev/null +++ b/changelogs/unreleased/199034-nomethoderror-undefined-method-unsubscribe-for-nil-nilclass.yml @@ -0,0 +1,5 @@ +--- +title: Fix 500 error when trying to unsubscribe from an already deleted entity +merge_request: 23747 +author: +type: fixed diff --git a/changelogs/unreleased/nfriend-31374-fix-permalink-button.yml b/changelogs/unreleased/nfriend-31374-fix-permalink-button.yml new file mode 100644 index 00000000000..1f10a066a9a --- /dev/null +++ b/changelogs/unreleased/nfriend-31374-fix-permalink-button.yml @@ -0,0 +1,5 @@ +--- +title: Fix hash parameter of Permalink and Blame button +merge_request: 23713 +author: +type: fixed |