Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-labels'

# Conflicts:
#   app/views/projects/labels/index.html.haml

11 files changed, 56 insertions, 0 deletions

diff --git a/changelogs/unreleased/42751-rename-master-to-maintainer.yml b/changelogs/unreleased/42751-rename-master-to-maintainer.yml
new file mode 100644
index 00000000000..d7f499ecd52
--- /dev/null
+++ b/changelogs/unreleased/42751-rename-master-to-maintainer.yml
@@ -0,0 +1,5 @@
+---
+title: Rename the Master role to Maintainer
+merge_request: 19080
+author:
+type: changed
diff --git a/changelogs/unreleased/45821-avatar_api.yml b/changelogs/unreleased/45821-avatar_api.yml
new file mode 100644
index 00000000000..e16b28c36a2
--- /dev/null
+++ b/changelogs/unreleased/45821-avatar_api.yml
@@ -0,0 +1,5 @@
+---
+title: Add Avatar API
+merge_request: 19121
+author: Imre Farkas
+type: added
diff --git a/changelogs/unreleased/47189-github_import_visibility.yml b/changelogs/unreleased/47189-github_import_visibility.yml
new file mode 100644
index 00000000000..a2a727a3227
--- /dev/null
+++ b/changelogs/unreleased/47189-github_import_visibility.yml
@@ -0,0 +1,6 @@
+---
+title: Use Github repo visibility during import while respecting restricted visibility
+  levels
+merge_request:
+author:
+type: fixed
diff --git a/changelogs/unreleased/bootstrap-changelog.yml b/changelogs/unreleased/bootstrap-changelog.yml
new file mode 100644
index 00000000000..fd58447769d
--- /dev/null
+++ b/changelogs/unreleased/bootstrap-changelog.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade GitLab from Bootstrap 3 to 4
+merge_request:
+author:
+type: other
diff --git a/changelogs/unreleased/bvl-graphql-start-34754.yml b/changelogs/unreleased/bvl-graphql-start-34754.yml
new file mode 100644
index 00000000000..a31f46d3a61
--- /dev/null
+++ b/changelogs/unreleased/bvl-graphql-start-34754.yml
@@ -0,0 +1,5 @@
+---
+title: Setup graphql with initial project & merge request query
+merge_request: 19008
+author:
+type: added
diff --git a/changelogs/unreleased/fj-40401-support-import-lfs-objects.yml b/changelogs/unreleased/fj-40401-support-import-lfs-objects.yml
new file mode 100644
index 00000000000..a8abdd943ba
--- /dev/null
+++ b/changelogs/unreleased/fj-40401-support-import-lfs-objects.yml
@@ -0,0 +1,5 @@
+---
+title: Added support for LFS Download in the importing process
+merge_request: 18871
+author:
+type: fixed
diff --git a/changelogs/unreleased/jprovazn-uploader-migration.yml b/changelogs/unreleased/jprovazn-uploader-migration.yml
new file mode 100644
index 00000000000..1db67e9ace2
--- /dev/null
+++ b/changelogs/unreleased/jprovazn-uploader-migration.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate any remaining jobs from deprecated `object_storage_upload` queue.
+merge_request:
+author:
+type: deprecated
diff --git a/changelogs/unreleased/live-trace-v2-persist-data.yml b/changelogs/unreleased/live-trace-v2-persist-data.yml
new file mode 100644
index 00000000000..3ac47b04218
--- /dev/null
+++ b/changelogs/unreleased/live-trace-v2-persist-data.yml
@@ -0,0 +1,5 @@
+---
+title: Add a cronworker to rescue stale live traces
+merge_request: 18680
+author:
+type: performance
diff --git a/changelogs/unreleased/rails5-fix-47376.yml b/changelogs/unreleased/rails5-fix-47376.yml
new file mode 100644
index 00000000000..ac9950e908e
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-47376.yml
@@ -0,0 +1,5 @@
+---
+title: Rails 5 fix glob spec
+merge_request: 19469
+author: Jasper Maes
+type: fixed
diff --git a/changelogs/unreleased/sh-improve-import-status-error.yml b/changelogs/unreleased/sh-improve-import-status-error.yml
new file mode 100644
index 00000000000..6523280f9e6
--- /dev/null
+++ b/changelogs/unreleased/sh-improve-import-status-error.yml
@@ -0,0 +1,5 @@
+---
+title: Show a more helpful error for import status
+merge_request:
+author:
+type: other
diff --git a/changelogs/unreleased/update-help-integration-screenshot.yml b/changelogs/unreleased/update-help-integration-screenshot.yml
new file mode 100644
index 00000000000..b1f76a346e4
--- /dev/null
+++ b/changelogs/unreleased/update-help-integration-screenshot.yml
@@ -0,0 +1,5 @@
+---
+title: Update screenshot in Gitlab.com integration documentation
+merge_request: 19433
+author: Tuğçe Nur Taş
+type: other