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/operations/filesystem_benchmarking.md

@@ -106,9 +106,9 @@ important metric is the `real` time.
 ```sh
 $ time for i in {0..1000}; do echo 'test' > "test${i}.txt"; done
 
-real	0m0.116s
-user	0m0.025s
-sys	0m0.091s
+real    0m0.116s
+user    0m0.025s
+sys     0m0.091s
 
 $ time for i in {0..1000}; do cat "test${i}.txt" > /dev/null; done
 

doc/administration/pseudonymizer.md

@@ -65,8 +65,8 @@ To configure the pseudonymizer, you need to:
 
    ```yaml
    pseudonymizer:
-   manifest: config/pseudonymizer.yml
-   upload:
+     manifest: config/pseudonymizer.yml
+     upload:
        remote_directory: 'gitlab-elt' # bucket name
        connection:
          provider: AWS

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`._
@@ -42,8 +41,8 @@ _The uploads are stored by default in
 
    ```yaml
    uploads:
-   storage_path: /mnt/storage
-   base_dir: uploads
+     storage_path: /mnt/storage
+     base_dir: uploads
    ```
 
 1. Save the file and [restart GitLab][] for the changes to take effect.
@@ -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/api/repositories.md

@@ -235,17 +235,17 @@ Example response:
 
 ```json
 {
-	"id": "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863",
-	"short_id": "1a0b36b3",
-	"title": "Initial commit",
-	"created_at": "2014-02-27T08:03:18.000Z",
-	"parent_ids": [],
-	"message": "Initial commit\n",
-	"author_name": "Dmitriy Zaporozhets",
-	"author_email": "dmitriy.zaporozhets@gmail.com",
-	"authored_date": "2014-02-27T08:03:18.000Z",
-	"committer_name": "Dmitriy Zaporozhets",
-	"committer_email": "dmitriy.zaporozhets@gmail.com",
-	"committed_date": "2014-02-27T08:03:18.000Z"
+  "id": "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863",
+  "short_id": "1a0b36b3",
+  "title": "Initial commit",
+  "created_at": "2014-02-27T08:03:18.000Z",
+  "parent_ids": [],
+  "message": "Initial commit\n",
+  "author_name": "Dmitriy Zaporozhets",
+  "author_email": "dmitriy.zaporozhets@gmail.com",
+  "authored_date": "2014-02-27T08:03:18.000Z",
+  "committer_name": "Dmitriy Zaporozhets",
+  "committer_email": "dmitriy.zaporozhets@gmail.com",
+  "committed_date": "2014-02-27T08:03:18.000Z"
 }
 ```

doc/development/gitaly.md

@@ -237,24 +237,23 @@ Here are the steps to gate a new feature in Gitaly behind a feature flag.
 1. Create prometheus metrics:
 
    ```go
-   var	findAllTagsRequests = prometheus.NewCounterVec(
-   		prometheus.CounterOpts{
-   			Name: "gitaly_find_all_tags_requests_total",
-   			Help: "Counter of go vs ruby implementation of FindAllTags",
-   		},
-   		[]string{"implementation"},
-   	)
+   var findAllTagsRequests = prometheus.NewCounterVec(
+     prometheus.CounterOpts{
+       Name: "gitaly_find_all_tags_requests_total",
+       Help: "Counter of go vs ruby implementation of FindAllTags",
+     },
+     []string{"implementation"},
    )
 
    func init() {
-   	prometheus.Register(findAllTagsRequests)
+     prometheus.Register(findAllTagsRequests)
    }
 
    if featureflag.IsEnabled(ctx, findAllTagsFeatureFlag) {
-   	findAllTagsRequests.WithLabelValues("go").Inc()
+     findAllTagsRequests.WithLabelValues("go").Inc()
      // go implementation
    } else {
-   	findAllTagsRequests.WithLabelValues("ruby").Inc()
+     findAllTagsRequests.WithLabelValues("ruby").Inc()
      // ruby implementation
    }
    ```

doc/raketasks/import.md

@@ -100,7 +100,7 @@ the git repository's config file. This section is formatted as follows:
 
 ```
 [gitlab]
-	fullpath = gitlab-org/gitlab-ce
+  fullpath = gitlab-org/gitlab-ce
 ```
 
 However, existing repositories were not migrated to include this path.

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

doc/user/project/integrations/project_services.md

@@ -20,10 +20,10 @@ Below, you will find a list of the currently supported ones accompanied with com
 
 Click on the service links to see further configuration instructions and details.
 
-| Service |	Description |
+| Service | Description |
 | ------- | ----------- |
-| Asana     |	Asana - Teamwork without email |
-| Assembla 	| Project Management Software (Source Commits Endpoint) |
+| Asana     | Asana - Teamwork without email |
+| Assembla | Project Management Software (Source Commits Endpoint) |
 | [Atlassian Bamboo CI](bamboo.md) | A continuous integration and build server |
 | Buildkite | Continuous integration and deployments |
 | [Bugzilla](bugzilla.md) | Bugzilla issue tracker |

doc/workflow/lfs/lfs_administration.md

@@ -148,20 +148,20 @@ On Omnibus installations, the settings are prefixed by `lfs_object_store_`:
 1. Edit `/etc/gitlab/gitlab.rb` and add the following lines by replacing with
    the values you want:
 
-	```ruby
-	gitlab_rails['lfs_object_store_enabled'] = true
-	gitlab_rails['lfs_object_store_remote_directory'] = "lfs-objects"
-	gitlab_rails['lfs_object_store_connection'] = {
-	  'provider' => 'AWS',
-	  'region' => 'eu-central-1',
-	  'aws_access_key_id' => '1ABCD2EFGHI34JKLM567N',
-	  'aws_secret_access_key' => 'abcdefhijklmnopQRSTUVwxyz0123456789ABCDE',
-	  # The below options configure an S3 compatible host instead of AWS
-	  'host' => 'localhost',
-	  'endpoint' => 'http://127.0.0.1:9000',
-	  'path_style' => true
-	}
-	```
+   ```ruby
+   gitlab_rails['lfs_object_store_enabled'] = true
+   gitlab_rails['lfs_object_store_remote_directory'] = "lfs-objects"
+   gitlab_rails['lfs_object_store_connection'] = {
+     'provider' => 'AWS',
+     'region' => 'eu-central-1',
+     'aws_access_key_id' => '1ABCD2EFGHI34JKLM567N',
+     'aws_secret_access_key' => 'abcdefhijklmnopQRSTUVwxyz0123456789ABCDE',
+     # The below options configure an S3 compatible host instead of AWS
+     'host' => 'localhost',
+     'endpoint' => 'http://127.0.0.1:9000',
+     'path_style' => true
+   }
+   ```
 
 1. Save the file and [reconfigure GitLab]s for the changes to take effect.
 1. Migrate any existing local LFS objects to the object storage:
@@ -182,22 +182,22 @@ For source installations the settings are nested under `lfs:` and then
 1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following
    lines:
 
-	```yaml
-	lfs:
-	enabled: true
-	object_store:
-	  enabled: false
-	  remote_directory: lfs-objects # Bucket name
-	  connection:
-	    provider: AWS
-	    aws_access_key_id: 1ABCD2EFGHI34JKLM567N
-	    aws_secret_access_key: abcdefhijklmnopQRSTUVwxyz0123456789ABCDE
-	    region: eu-central-1
-	    # Use the following options to configure an AWS compatible host such as Minio
-	    host: 'localhost'
-	    endpoint: 'http://127.0.0.1:9000'
-	    path_style: true
-	```
+   ```yaml
+   lfs:
+   enabled: true
+   object_store:
+     enabled: false
+     remote_directory: lfs-objects # Bucket name
+     connection:
+       provider: AWS
+       aws_access_key_id: 1ABCD2EFGHI34JKLM567N
+       aws_secret_access_key: abcdefhijklmnopQRSTUVwxyz0123456789ABCDE
+       region: eu-central-1
+       # Use the following options to configure an AWS compatible host such as Minio
+       host: 'localhost'
+       endpoint: 'http://127.0.0.1:9000'
+       path_style: true
+   ```
 
 1. Save the file and [restart GitLab][] for the changes to take effect.
 1. Migrate any existing local LFS objects to the object storage:

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';