Automatic merge of gitlab-org/gitlab-ce master

app/helpers/icons_helper.rb

@@ -122,27 +122,30 @@ module IconsHelper
         icon_class = 'file-pdf-o'
       when '.jpg', '.jpeg', '.jif', '.jfif',
           '.jp2', '.jpx', '.j2k', '.j2c',
-          '.png', '.gif', '.tif', '.tiff',
-          '.svg', '.ico', '.bmp'
+          '.apng', '.png', '.gif', '.tif', '.tiff',
+          '.svg', '.ico', '.bmp', '.webp'
         icon_class = 'file-image-o'
-      when '.zip', '.zipx', '.tar', '.gz', '.bz', '.bzip',
-          '.xz', '.rar', '.7z'
+      when '.zip', '.zipx', '.tar', '.gz', '.gzip', '.tgz', '.bz', '.bzip',
+          '.bz2', '.bzip2', '.car', '.tbz', '.xz', 'txz', '.rar', '.7z',
+          '.lz', '.lzma', '.tlz'
         icon_class = 'file-archive-o'
-      when '.mp3', '.wma', '.ogg', '.oga', '.wav', '.flac', '.aac'
+      when '.mp3', '.wma', '.ogg', '.oga', '.wav', '.flac', '.aac', '.3ga',
+          '.ac3', '.midi', '.m4a', '.ape', '.mpa'
         icon_class = 'file-audio-o'
       when '.mp4', '.m4p', '.m4v',
           '.mpg', '.mp2', '.mpeg', '.mpe', '.mpv',
-          '.mpg', '.mpeg', '.m2v',
+          '.mpg', '.mpeg', '.m2v', '.m2ts',
           '.avi', '.mkv', '.flv', '.ogv', '.mov',
           '.3gp', '.3g2'
         icon_class = 'file-video-o'
-      when '.doc', '.dot', '.docx', '.docm', '.dotx', '.dotm', '.docb'
+      when '.doc', '.dot', '.docx', '.docm', '.dotx', '.dotm', '.docb',
+          '.odt', '.ott', '.uot', '.rtf'
         icon_class = 'file-word-o'
       when '.xls', '.xlt', '.xlm', '.xlsx', '.xlsm', '.xltx', '.xltm',
-          '.xlsb', '.xla', '.xlam', '.xll', '.xlw'
+          '.xlsb', '.xla', '.xlam', '.xll', '.xlw', '.ots', '.ods', '.uos'
         icon_class = 'file-excel-o'
       when '.ppt', '.pot', '.pps', '.pptx', '.pptm', '.potx', '.potm',
-          '.ppam', '.ppsx', '.ppsm', '.sldx', '.sldm'
+          '.ppam', '.ppsx', '.ppsm', '.sldx', '.sldm', '.odp', '.otp', '.uop'
         icon_class = 'file-powerpoint-o'
       else
         icon_class = 'file-text-o'

doc/migrate_ci_to_ce/README.md

@@ -181,7 +181,7 @@ sudo -u gitlab_ci -H bundle exec rake backup:show_secrets RAILS_ENV=production
 ### 2. SQL data and build traces
 
 Create your final CI data export. If you are converting from MySQL to
-  PostgreSQL, add ` MYSQL_TO_POSTGRESQL=1` to the end of the rake command. When
+PostgreSQL, add `MYSQL_TO_POSTGRESQL=1` to the end of the rake command. When
 the command finishes it will print the path to your data export archive; you
 will need this file later.
 
@@ -323,11 +323,15 @@ You should also make sure that you can:
 
 ### 2. Check Nginx configuration
 
-    sudo nginx -t
+```sh
+sudo nginx -t
+```
 
 ### 3. Restart Nginx
 
-    sudo /etc/init.d/nginx restart
+```sh
+sudo /etc/init.d/nginx restart
+```
 
 ### Restore from backup
 
@@ -352,11 +356,13 @@ The fix for this is to update to Omnibus 7.14 first and then update it to 8.0.
 ### Permission denied when accessing /var/opt/gitlab/gitlab-ci/builds
 
 To fix that issue you have to change builds/ folder permission before doing final backup:
+
 ```
 sudo chown -R gitlab-ci:gitlab-ci /var/opt/gitlab/gitlab-ci/builds
 ```
 
 Then before executing `ci:migrate` you need to fix builds folder permission:
+
 ```
 sudo chown git:git /var/opt/gitlab/gitlab-ci/builds
 ```

doc/ssh/README.md

@@ -176,7 +176,6 @@ Now, it's time to add the newly created public key to your GitLab account.
 1. Add your **public** SSH key to your GitLab account by:
    1. Clicking your avatar in the upper right corner and selecting **Settings**.
    1. Navigating to **SSH Keys** and pasting your **public** key in the **Key** field. If you:
-
       - Created the key with a comment, this will appear in the **Title** field.
       - Created the key without a comment, give your key an identifiable title like _Work Laptop_ or _Home Workstation_.
    1. Click the **Add key** button.

doc/user/markdown.md

@@ -586,9 +586,11 @@ def function():
     print s
 ```
 
-    Using 4 spaces
-    is like using
-    3-backtick fences.
+```
+Using 4 spaces
+is like using
+3-backtick fences.
+```
 
 ~~~
 Tildes are OK too.

doc/user/project/clusters/index.md

@@ -115,6 +115,7 @@ To add an existing Kubernetes cluster to your project:
      ```sh
      kubectl cluster-info | grep 'Kubernetes master' | awk '/http/ {print $NF}'
      ```
+
    - **CA certificate** (required) - A valid Kubernetes certificate is needed to authenticate to the EKS cluster. We will use the certificate created by default.
      - List the secrets with `kubectl get secrets`, and one should named similar to
       `default-token-xxxxx`. Copy that token name for use below.
@@ -123,6 +124,7 @@ To add an existing Kubernetes cluster to your project:
      ```sh
      kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 --decode
      ```
+
    - **Token** -
      GitLab authenticates against Kubernetes using service tokens, which are
      scoped to a particular `namespace`.

doc/user/project/clusters/serverless/index.md

@@ -202,7 +202,7 @@ Follow these steps to deploy a function using the Node.js runtime to your Knativ
    from **Apply a template** dropdown when editing the `.gitlab-ci.yml` file through
    the user interface.
 
-2. `serverless.yml`: this file contains the metadata for your functions,
+1. `serverless.yml`: this file contains the metadata for your functions,
    such as name, runtime, and environment.
 
    It must be included at the root of your repository.
@@ -288,7 +288,8 @@ The sample function can now be triggered from any HTTP client using a simple `PO
      --data '{"GitLab":"FaaS"}' \
      http://functions-echo.functions-1.functions.example.com/
      ```
-  2. Using a web-based tool (ie. postman, restlet, etc)
+
+  1. Using a web-based tool (ie. postman, restlet, etc)
 
      ![function execution](img/function-execution.png)
 
@@ -424,7 +425,6 @@ The instructions below relate to installing and running Certbot on a Linux serve
 1. Run the following command to use Certbot to request a certificate
    using DNS challenge during authorization:
 
-
    ```sh
    ./certbot-auto certonly --manual --preferred-challenges dns -d '*.<namespace>.example.com'
    ```

doc/user/project/repository/gpg_signed_commits/index.md

@@ -73,6 +73,7 @@ started:
    What keysize do you want? (2048) 4096
    Requested keysize is 4096 bits
    ```
+
 1. Next, you need to specify the validity period of your key. This is something
    subjective, and you can use the default value which is to never expire:
 

spec/helpers/icons_helper_spec.rb

@@ -125,6 +125,14 @@ describe IconsHelper do
       expect(file_type_icon_class('file', 0, 'filename.png')).to eq 'file-image-o'
     end
 
+    it 'returns file-image-o class with .apng' do
+      expect(file_type_icon_class('file', 0, 'filename.apng')).to eq 'file-image-o'
+    end
+
+    it 'returns file-image-o class with .webp' do
+      expect(file_type_icon_class('file', 0, 'filename.webp')).to eq 'file-image-o'
+    end
+
     it 'returns file-archive-o class with .tar' do
       expect(file_type_icon_class('file', 0, 'filename.tar')).to eq 'file-archive-o'
     end
@@ -145,6 +153,10 @@ describe IconsHelper do
       expect(file_type_icon_class('file', 0, 'filename.MP3')).to eq 'file-audio-o'
     end
 
+    it 'returns file-audio-o class with .m4a' do
+      expect(file_type_icon_class('file', 0, 'filename.m4a')).to eq 'file-audio-o'
+    end
+
     it 'returns file-audio-o class with .wav' do
       expect(file_type_icon_class('file', 0, 'filename.wav')).to eq 'file-audio-o'
     end
@@ -161,6 +173,10 @@ describe IconsHelper do
       expect(file_type_icon_class('file', 0, 'filename.mp4')).to eq 'file-video-o'
     end
 
+    it 'returns file-word-o class with .odt' do
+      expect(file_type_icon_class('file', 0, 'filename.odt')).to eq 'file-word-o'
+    end
+
     it 'returns file-word-o class with .doc' do
       expect(file_type_icon_class('file', 0, 'filename.doc')).to eq 'file-word-o'
     end
@@ -185,6 +201,10 @@ describe IconsHelper do
       expect(file_type_icon_class('file', 0, 'filename.xlsx')).to eq 'file-excel-o'
     end
 
+    it 'returns file-excel-o class with .odp' do
+      expect(file_type_icon_class('file', 0, 'filename.odp')).to eq 'file-powerpoint-o'
+    end
+
     it 'returns file-excel-o class with .ppt' do
       expect(file_type_icon_class('file', 0, 'filename.ppt')).to eq 'file-powerpoint-o'
     end