Automatic merge of gitlab-org/gitlab-ce master

config/webpack.config.js

@@ -344,6 +344,8 @@ module.exports = {
 
   devtool: NO_SOURCEMAPS ? false : devtool,
 
-  // sqljs requires fs
-  node: { fs: 'empty' },
+  node: {
+    fs: 'empty', // sqljs requires fs
+    setImmediate: false,
+  },
 };

doc/administration/uploads.md

 # Uploads administration
 
->**Notes:**
 Uploads represent all user data that may be sent to GitLab as a single file. As an example, avatars and notes' attachments are uploads. Uploads are integral to GitLab functionality, and therefore cannot be disabled.
 
 ## Using local storage
 
->**Notes:**
+NOTE: **Note:**
 This is the default configuration
 
 To change the location where the uploads are stored locally, follow the steps
@@ -15,7 +14,7 @@ below.
 
 **In Omnibus installations:**
 
->**Notes:**
+NOTE: **Note:**
 For historical reasons, uploads are stored into a base directory, which by default is `uploads/-/system`. It is strongly discouraged to change this configuration option on an existing GitLab installation.
 
 _The uploads are stored by default in `/var/opt/gitlab/gitlab-rails/uploads`._
@@ -108,8 +107,8 @@ _The uploads are stored by default in
    }
    ```
 
-   >**Note:**
-   >If you are using AWS IAM profiles, be sure to omit the AWS access key and secret access key/value pairs.
+   NOTE: **Note:**
+   If you are using AWS IAM profiles, be sure to omit the AWS access key and secret access key/value pairs.
 
    ```ruby
    gitlab_rails['uploads_object_store_connection'] = {

doc/development/gitaly.md

@@ -244,7 +244,6 @@ Here are the steps to gate a new feature in Gitaly behind a feature flag.
      },
      []string{"implementation"},
    )
-   )
 
    func init() {
      prometheus.Register(findAllTagsRequests)

doc/user/project/code_owners.md

@@ -57,8 +57,8 @@ Example `CODEOWNERS` file:
 # Files with a `#` can still be accesssed by escaping the pound sign
 \#file_with_pound.rb @owner-file-with-pound
 
-# Multiple codeowners can be specified, separated by whitespace
-CODEOWNERS @multiple @owners	@tab-separated
+# Multiple codeowners can be specified, separated by spaces or tabs
+CODEOWNERS @multiple @code @owners 
 
 # Both usernames or email addresses can be used to match
 # users. Everything else will be ignored. For example this will

spec/javascripts/helpers/vuex_action_helper.js

@@ -89,9 +89,7 @@ export default (
     payload,
   );
 
-  return new Promise(resolve => {
-    setImmediate(resolve);
-  })
+  return new Promise(setImmediate)
     .then(() => result)
     .catch(error => {
       validateResults();

spec/javascripts/test_bundle.js

@@ -3,6 +3,7 @@
 */
 
 import $ from 'jquery';
+import 'core-js/features/set-immediate';
 import 'vendor/jasmine-jquery';
 import '~/commons';
 import Vue from 'vue';