summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 15:06:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 15:06:24 +0000
commit88542a5e9613c8442a982e65ad5cf13eb33bc541 (patch)
tree11a65d86e623b443b8a2976cc93cff360e2da8a2 /changelogs
parentb570d73ecd31e2ca9cf8c2f1adb056edf2869477 (diff)
downloadgitlab-ce-88542a5e9613c8442a982e65ad5cf13eb33bc541.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/bvl-remove-validate-merge-sha-ff.yml6
-rw-r--r--changelogs/unreleased/remove-done-callbacks-from-vue-components-markdown.yml5
-rw-r--r--changelogs/unreleased/search-list-of-sentry-errors.yml5
3 files changed, 16 insertions, 0 deletions
diff --git a/changelogs/unreleased/bvl-remove-validate-merge-sha-ff.yml b/changelogs/unreleased/bvl-remove-validate-merge-sha-ff.yml
new file mode 100644
index 00000000000..c5a6a46a835
--- /dev/null
+++ b/changelogs/unreleased/bvl-remove-validate-merge-sha-ff.yml
@@ -0,0 +1,6 @@
+---
+title: Validate the merge sha before merging, confirming that the merge will only
+ contain what the user saw
+merge_request: 20348
+author:
+type: fixed
diff --git a/changelogs/unreleased/remove-done-callbacks-from-vue-components-markdown.yml b/changelogs/unreleased/remove-done-callbacks-from-vue-components-markdown.yml
new file mode 100644
index 00000000000..22c87df8304
--- /dev/null
+++ b/changelogs/unreleased/remove-done-callbacks-from-vue-components-markdown.yml
@@ -0,0 +1,5 @@
+---
+title: Remove done callbacks from vue_shared/components/markdown
+merge_request: 16842
+author: Lee Tickett
+type: other
diff --git a/changelogs/unreleased/search-list-of-sentry-errors.yml b/changelogs/unreleased/search-list-of-sentry-errors.yml
new file mode 100644
index 00000000000..f48de359b1b
--- /dev/null
+++ b/changelogs/unreleased/search-list-of-sentry-errors.yml
@@ -0,0 +1,5 @@
+---
+title: Search list of Sentry errors by title in GitLab
+merge_request: 19439
+author:
+type: added