From e1f8f12bbed19bea753d81d7586b30ea403733d5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 19 Jun 2020 15:08:39 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../unreleased/214824-fix-web-ide-open-file-race-condition.yml | 4 ++++ .../unreleased/georgekoltsov-emit-bitbucket-server-metrics.yml | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 changelogs/unreleased/214824-fix-web-ide-open-file-race-condition.yml create mode 100644 changelogs/unreleased/georgekoltsov-emit-bitbucket-server-metrics.yml (limited to 'changelogs/unreleased') diff --git a/changelogs/unreleased/214824-fix-web-ide-open-file-race-condition.yml b/changelogs/unreleased/214824-fix-web-ide-open-file-race-condition.yml new file mode 100644 index 00000000000..c390e805514 --- /dev/null +++ b/changelogs/unreleased/214824-fix-web-ide-open-file-race-condition.yml @@ -0,0 +1,4 @@ +--- +title: Resolve "WebIDE displays blank file incorrectly" +merge_request: 33391 +type: fixed diff --git a/changelogs/unreleased/georgekoltsov-emit-bitbucket-server-metrics.yml b/changelogs/unreleased/georgekoltsov-emit-bitbucket-server-metrics.yml new file mode 100644 index 00000000000..6f43b37bbae --- /dev/null +++ b/changelogs/unreleased/georgekoltsov-emit-bitbucket-server-metrics.yml @@ -0,0 +1,5 @@ +--- +title: Emit Bitbucket Server Importer metrics +merge_request: 33700 +author: +type: changed -- cgit v1.2.3