diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 03:06:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 03:06:05 +0300 |
| commit | 8dfb94309c3e84937189f73a4149d654e20332e9 (patch) | |
| tree | 1543a7b74b2e5c683a39fd93b09afc578f758c2b /changelogs | |
| parent | 170f0bdcdef9c9b226abfe0a50d6687c65e8d613 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-time-limit-merge-rebase-lock.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/show-prometheus-is-updating.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-time-limit-merge-rebase-lock.yml b/changelogs/unreleased/sh-time-limit-merge-rebase-lock.yml new file mode 100644 index 00000000000..c96db4d2ea9 --- /dev/null +++ b/changelogs/unreleased/sh-time-limit-merge-rebase-lock.yml @@ -0,0 +1,5 @@ +--- +title: Time limit the database lock when rebasing a merge request +merge_request: 18481 +author: +type: fixed diff --git a/changelogs/unreleased/show-prometheus-is-updating.yml b/changelogs/unreleased/show-prometheus-is-updating.yml new file mode 100644 index 00000000000..a62c0eb26ac --- /dev/null +++ b/changelogs/unreleased/show-prometheus-is-updating.yml @@ -0,0 +1,5 @@ +--- +title: Expose prometheus status to monitor dashboard +merge_request: 18289 +author: +type: fixed |