Add latest changes from gitlab-org/gitlab@master

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
+## 12.8.3
+
+- No changes.
+
 ## 12.8.2
 ### Security (5 changes)

CHANGELOG.md

@@ -2,6 +2,29 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 12.8.3
+
+### Fixed (8 changes)
+
+- Fix Group Import API file upload when object storage is disabled. !25715
+- Fix Web IDE fork modal showing no text. !25842
+- Fixed regression when URL was encoded in a loop. !25849
+- Fixed repository browsing for folders with non-ascii characters. !25877
+- Fix search for Sentry error list. !26129
+- Send credentials with GraphQL fetch requests. !26386
+- Show CI status in project dashboards. !26403
+- Rescue invalid URLs during badge retrieval in asset proxy. !26524
+
+### Performance (2 changes)
+
+- Disable Marginalia line backtrace in production. !26199
+- Remove unnecessary Redis deletes for broadcast messages. !26541
+
+### Other (1 change, 1 of them is from the community)
+
+- Fix fixtures for Error Tracking Web UI. !26233 (Takuya Noguchi)
+
+
 ## 12.8.2
 ### Security (17 changes)

GITLAB_PAGES_VERSION

-1.16.0
+1.17.0

app/assets/javascripts/editor/editor_lite.js

 import { editor as monacoEditor, languages as monacoLanguages, Uri } from 'monaco-editor';
-import whiteTheme from '~/ide/lib/themes/white';
+import { DEFAULT_THEME, themes } from '~/ide/lib/themes';
 import { defaultEditorOptions } from '~/ide/lib/editor_options';
 import { clearDomElement } from './utils';
@@ -19,8 +19,10 @@ export default class Editor {
   }
   static setupMonacoTheme() {
-    monacoEditor.defineTheme('white', whiteTheme);
-    monacoEditor.setTheme('white');
+    const themeName = window.gon?.user_color_scheme || DEFAULT_THEME;
+    const theme = themes.find(t => t.name === themeName);
+    if (theme) monacoEditor.defineTheme(themeName, theme.data);
+    monacoEditor.setTheme(theme ? themeName : DEFAULT_THEME);
   }
   createInstance({ el = undefined, blobPath = '', blobContent = '' } = {}) {

changelogs/unreleased/202426-editor-lite-theme-preference.yml

+---
+title: In single-file editor set syntax highlighting theme according to user's preference
+merge_request: 26606
+author:
+type: changed

changelogs/unreleased/207837-circular-encoding.yml

----
-title: Fixed regression when URL was encoded in a loop
-merge_request: 25849
-author:
-type: fixed

changelogs/unreleased/207857-fix-web-ide-modal-no-text.yml

----
-title: Fix Web IDE fork modal showing no text
-merge_request: 25842
-author:
-type: fixed

changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml

----
-title: Fix fixtures for Error Tracking Web UI
-merge_request: 26233
-author: Takuya Noguchi
-type: other

changelogs/unreleased/28085-index-options-tuning.yml

+---
+title: Optimize storage usage for newly created ES indices
+merge_request: 25992
+author:
+type: other

changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml

----
-title: Fix Group Import API file upload when object storage is disabled
-merge_request: 25715
-author:
-type: fixed

changelogs/unreleased/lm-fix-error-query.yml

----
-title: Fix search for Sentry error list
-merge_request: 26129
-author:
-type: fixed

changelogs/unreleased/mc-feature-trigger-pipelines-project-subscriptions.yml

+---
+title: Add ability to trigger pipelines when project is rebuilt.
+merge_request: 20063
+author:
+type: added

changelogs/unreleased/pages-1-17.yml

+---
+title: Upgrade Pages to 1.17.0
+merge_request: 26478
+author:
+type: added

changelogs/unreleased/ph-p207499-fixNonAsciiChars.yml

----
-title: Fixed repository browsing for folders with non-ascii characters
-merge_request: 25877
-author:
-type: fixed

changelogs/unreleased/revert-e0613e64.yml

----
-title: Show CI status in project dashboards
-merge_request: 26403
-author:
-type: fixed

changelogs/unreleased/sh-disable-line-in-marginalia.yml

----
-title: Disable Marginalia line backtrace in production
-merge_request: 26199
-author:
-type: performance

changelogs/unreleased/sh-optimize-broadcast-message-redis.yml

----
-title: Remove unnecessary Redis deletes for broadcast messages
-merge_request: 26541
-author:
-type: performance

changelogs/unreleased/use-addressable-for-asset-proxy-badge-render.yml

----
-title: Rescue invalid URLs during badge retrieval in asset proxy
-merge_request: 26524
-author:
-type: fixed

changelogs/unreleased/vs-add-credentials-option-for-apollo-link.yml

----
-title: Send credentials with GraphQL fetch requests
-merge_request: 26386
-author:
-type: fixed

db/migrate/20200224185814_add_project_subscriptions_to_plan_limits.rb

+# frozen_string_literal: true
+
+class AddProjectSubscriptionsToPlanLimits < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column(:plan_limits, :ci_project_subscriptions, :integer, default: 0, null: false)
+  end
+end