Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-14

# Conflicts:
#	Gemfile.lock

[ci skip]

.gitlab-ci.yml

@@ -850,7 +850,7 @@ codequality:
   tags: []
   before_script: []
   services:
-    - docker:dind
+    - docker:stable-dind
   variables:
     SETUP_DB: "false"
     DOCKER_DRIVER: overlay2

Gemfile.lock

@@ -1103,7 +1103,10 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
+<<<<<<< HEAD
   gitlab-license (~> 1.0)
+=======
+>>>>>>> upstream/master
   gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)

app/assets/javascripts/ide/stores/modules/commit/actions.js

@@ -37,9 +37,9 @@ export const setLastCommitMessage = ({ rootState, commit }, data) => {
   const commitMsg = sprintf(
     __('Your changes have been committed. Commit %{commitId} %{commitStats}'),
     {
-      commitId: `<a href="${currentProject.web_url}/commit/${
+      commitId: `<a href="${currentProject.web_url}/commit/${data.short_id}" class="commit-sha">${
         data.short_id
-      }" class="commit-sha">${data.short_id}</a>`,
+      }</a>`,
       commitStats,
     },
     false,
@@ -54,9 +54,7 @@ export const checkCommitStatus = ({ rootState }) =>
     .then(({ data }) => {
       const { id } = data.commit;
       const selectedBranch =
-        rootState.projects[rootState.currentProjectId].branches[
-          rootState.currentBranchId
-        ];
+        rootState.projects[rootState.currentProjectId].branches[rootState.currentBranchId];
 
       if (selectedBranch.workingReference !== id) {
         return true;
@@ -135,32 +133,15 @@ export const updateFilesAfterCommit = (
 
   if (state.commitAction === consts.COMMIT_TO_NEW_BRANCH) {
     router.push(
-      `/project/${rootState.currentProjectId}/blob/${branch}/${
-        rootGetters.activeFile.path
-      }`,
+      `/project/${rootState.currentProjectId}/blob/${branch}/${rootGetters.activeFile.path}`,
     );
   }
-
-  dispatch('updateCommitAction', consts.COMMIT_TO_CURRENT_BRANCH);
 };
 
-export const commitChanges = ({
-  commit,
-  state,
-  getters,
-  dispatch,
-  rootState,
-}) => {
+export const commitChanges = ({ commit, state, getters, dispatch, rootState }) => {
   const newBranch = state.commitAction !== consts.COMMIT_TO_CURRENT_BRANCH;
-  const payload = createCommitPayload(
-    getters.branchName,
-    newBranch,
-    state,
-    rootState,
-  );
-  const getCommitStatus = newBranch
-    ? Promise.resolve(false)
-    : dispatch('checkCommitStatus');
+  const payload = createCommitPayload(getters.branchName, newBranch, state, rootState);
+  const getCommitStatus = newBranch ? Promise.resolve(false) : dispatch('checkCommitStatus');
 
   commit(types.UPDATE_LOADING, true);
 
@@ -182,12 +163,16 @@ export const commitChanges = ({
 
       if (!data.short_id) {
         flash(data.message, 'alert', document, null, false, true);
-        return;
+        return null;
       }
 
       dispatch('setLastCommitMessage', data);
       dispatch('updateCommitMessage', '');
-
+      return dispatch('updateFilesAfterCommit', {
+        data,
+        branch: getters.branchName,
+      })
+        .then(() => {
           if (state.commitAction === consts.COMMIT_TO_NEW_BRANCH_MR) {
             dispatch(
               'redirectToUrl',
@@ -198,13 +183,10 @@ export const commitChanges = ({
               ),
               { root: true },
             );
-      } else {
-        dispatch('updateFilesAfterCommit', {
-          data,
-          branch: getters.branchName,
-        });
           }
         })
+        .then(() => dispatch('updateCommitAction', consts.COMMIT_TO_CURRENT_BRANCH));
+    })
     .catch(err => {
       let errMsg = __('Error committing changes. Please try again.');
       if (err.response.data && err.response.data.message) {

app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue

@@ -146,8 +146,8 @@ export default {
     </p>
     <p
       v-if="shouldShowMemoryGraph"
-      class="usage-info js-usage-info">
-      {{ memoryChangeMessage }}
+      class="usage-info js-usage-info"
+      v-html="memoryChangeMessage">
     </p>
     <p
       v-if="shouldShowLoadFailure"

changelogs/unreleased/fj-change-gollum-gems-to-custom-ones.yml

+---
+title: Replacing gollum libraries for gitlab custom libs
+merge_request: 18343
+author:
+type: other

changelogs/unreleased/ide-mr-changes-alert-box.yml

+---
+title: Removed alert box in IDE when redirecting to new merge request
+merge_request:
+author:
+type: fixed

doc/ci/docker/using_docker_build.md

@@ -101,12 +101,12 @@ In order to do that, follow the steps:
       --registration-token REGISTRATION_TOKEN \
       --executor docker \
       --description "My Docker Runner" \
-      --docker-image "docker:latest" \
+      --docker-image "docker:stable" \
       --docker-privileged
     ```
 
     The above command will register a new Runner to use the special
-    `docker:latest` image which is provided by Docker. **Notice that it's using
+    `docker:stable` image which is provided by Docker. **Notice that it's using
     the `privileged` mode to start the build and service containers.** If you
     want to use [docker-in-docker] mode, you always have to use `privileged = true`
     in your Docker containers.
@@ -120,7 +120,7 @@ In order to do that, follow the steps:
       executor = "docker"
       [runners.docker]
         tls_verify = false
-        image = "docker:latest"
+        image = "docker:stable"
         privileged = true
         disable_cache = false
         volumes = ["/cache"]
@@ -132,7 +132,7 @@ In order to do that, follow the steps:
    `docker:dind` service):
 
     ```yaml
-    image: docker:latest
+    image: docker:stable
 
     # When using dind, it's wise to use the overlayfs driver for
     # improved performance.
@@ -201,12 +201,12 @@ In order to do that, follow the steps:
       --registration-token REGISTRATION_TOKEN \
       --executor docker \
       --description "My Docker Runner" \
-      --docker-image "docker:latest" \
+      --docker-image "docker:stable" \
       --docker-volumes /var/run/docker.sock:/var/run/docker.sock
     ```
 
     The above command will register a new Runner to use the special
-    `docker:latest` image which is provided by Docker. **Notice that it's using
+    `docker:stable` image which is provided by Docker. **Notice that it's using
     the Docker daemon of the Runner itself, and any containers spawned by docker
     commands will be siblings of the Runner rather than children of the runner.**
     This may have complications and limitations that are unsuitable for your workflow.
@@ -220,7 +220,7 @@ In order to do that, follow the steps:
       executor = "docker"
       [runners.docker]
         tls_verify = false
-        image = "docker:latest"
+        image = "docker:stable"
         privileged = false
         disable_cache = false
         volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
@@ -232,7 +232,7 @@ In order to do that, follow the steps:
    include the `docker:dind` service as when using the Docker in Docker executor):
 
     ```yaml
-    image: docker:latest
+    image: docker:stable
 
     before_script:
     - docker info
@@ -286,7 +286,7 @@ any image that's used with the `--cache-from` argument must first be pulled
 Here's a simple `.gitlab-ci.yml` file showing how Docker caching can be utilized:
 
 ```yaml
-image: docker:latest
+image: docker:stable
 
 services:
   - docker:dind
@@ -388,7 +388,7 @@ could look like:
 
 ```yaml
  build:
-   image: docker:latest
+   image: docker:stable
    services:
    - docker:dind
    stage: build
@@ -434,7 +434,7 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using
 an application-specific deploy script:
 
 ```yaml
-image: docker:latest
+image: docker:stable
 services:
 - docker:dind
 

doc/ci/docker/using_docker_images.md

@@ -86,7 +86,7 @@ services](#accessing-the-services).
 ### How the health check of services works
 
 Services are designed to provide additional functionality which is **network accessible**.
-It may be a database like MySQL, or Redis, and even `docker:dind` which
+It may be a database like MySQL, or Redis, and even `docker:stable-dind` which
 allows you to use Docker in Docker. It can be practically anything that is
 required for the CI/CD job to proceed and is accessed by network.
 

doc/ci/examples/browser_performance.md

@@ -17,7 +17,7 @@ performance:
   variables:
     URL: https://example.com
   services:
-    - docker:dind
+    - docker:stable-dind
   script:
     - mkdir gitlab-exporter
     - wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
@@ -94,7 +94,7 @@ performance:
   stage: performance
   image: docker:git
   services:
-    - docker:dind
+    - docker:stable-dind
   dependencies:
     - review
   script:

doc/install/kubernetes/gitlab_runner_chart.md

@@ -80,7 +80,7 @@ runners:
   image: ubuntu:16.04
 
   ## Run all containers with the privileged flag enabled
-  ## This will allow the docker:dind image to run if you need to run Docker
+  ## This will allow the docker:stable-dind image to run if you need to run Docker
   ## commands. Please read the docs before turning this on:
   ## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
   ##
@@ -147,7 +147,7 @@ enable privileged mode in `values.yaml`:
 ```yaml
 runners:
   ## Run all containers with the privileged flag enabled
-  ## This will allow the docker:dind image to run if you need to run Docker
+  ## This will allow the docker:stable-dind image to run if you need to run Docker
   ## commands. Please read the docs before turning this on:
   ## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
   ##

lib/gitlab/git/repository.rb

@@ -1474,7 +1474,7 @@ module Gitlab
 
         return [] if empty? || safe_query.blank?
 
-        args = %W(ls-tree --full-tree -r #{ref || root_ref} --name-status | #{safe_query})
+        args = %W(ls-tree -r --name-status --full-tree #{ref || root_ref} -- #{safe_query})
 
         run_git(args).first.lines.map(&:strip)
       end

package.json

@@ -16,7 +16,7 @@
     "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
   },
   "dependencies": {
-    "@gitlab-org/gitlab-svgs": "^1.17.0",
+    "@gitlab-org/gitlab-svgs": "^1.18.0",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-core": "^6.26.0",

spec/factories/ci/builds.rb

@@ -206,7 +206,7 @@ FactoryBot.define do
       options do
         {
             image: { name: 'ruby:2.1', entrypoint: '/bin/sh' },
-            services: ['postgres', { name: 'docker:dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }],
+            services: ['postgres', { name: 'docker:stable-dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }],
             after_script: %w(ls date),
             artifacts: {
                 name: 'artifacts_file',

spec/javascripts/ide/stores/modules/commit/actions_spec.js

@@ -133,10 +133,7 @@ describe('IDE commit module actions', () => {
       store
         .dispatch('commit/checkCommitStatus')
         .then(() => {
-          expect(service.getBranchData).toHaveBeenCalledWith(
-            'abcproject',
-            'master',
-          );
+          expect(service.getBranchData).toHaveBeenCalledWith('abcproject', 'master');
 
           done();
         })
@@ -230,9 +227,7 @@ describe('IDE commit module actions', () => {
           branch,
         })
         .then(() => {
-          expect(
-            store.state.projects.abcproject.branches.master.workingReference,
-          ).toBe(data.id);
+          expect(store.state.projects.abcproject.branches.master.workingReference).toBe(data.id);
         })
         .then(done)
         .catch(done.fail);
@@ -317,26 +312,7 @@ describe('IDE commit module actions', () => {
           branch,
         })
         .then(() => {
-          expect(router.push).toHaveBeenCalledWith(
-            `/project/abcproject/blob/master/${f.path}`,
-          );
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('resets stores commit actions', done => {
-      store.state.commit.commitAction = consts.COMMIT_TO_NEW_BRANCH;
-
-      store
-        .dispatch('commit/updateFilesAfterCommit', {
-          data,
-          branch,
-        })
-        .then(() => {
-          expect(store.state.commit.commitAction).not.toBe(
-            consts.COMMIT_TO_NEW_BRANCH,
-          );
+          expect(router.push).toHaveBeenCalledWith(`/project/abcproject/blob/master/${f.path}`);
         })
         .then(done)
         .catch(done.fail);
@@ -448,15 +424,26 @@ describe('IDE commit module actions', () => {
         store
           .dispatch('commit/commitChanges')
           .then(() => {
-            expect(store.state.openFiles[0].lastCommit.message).toBe(
-              'test message',
-            );
+            expect(store.state.openFiles[0].lastCommit.message).toBe('test message');
 
             done();
           })
           .catch(done.fail);
       });
 
+      it('resets stores commit actions', done => {
+        store.state.commit.commitAction = consts.COMMIT_TO_NEW_BRANCH;
+
+        store
+          .dispatch('commit/commitChanges')
+          .then(() => {
+            expect(store.state.commit.commitAction).not.toBe(consts.COMMIT_TO_NEW_BRANCH);
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      describe('merge request', () => {
         it('redirects to new merge request page', done => {
           spyOn(eventHub, '$on');
 
@@ -475,6 +462,22 @@ describe('IDE commit module actions', () => {
             })
             .catch(done.fail);
         });
+
+        it('resets changed files before redirecting', done => {
+          spyOn(eventHub, '$on');
+
+          store.state.commit.commitAction = '3';
+
+          store
+            .dispatch('commit/commitChanges')
+            .then(() => {
+              expect(store.state.changedFiles.length).toBe(0);
+
+              done();
+            })
+            .catch(done.fail);
+        });
+      });
     });
 
     describe('failed', () => {

spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js

@@ -51,8 +51,7 @@ const createComponent = () => {
 
 const messages = {
   loadingMetrics: 'Loading deployment statistics',
-  hasMetrics:
-    '<a href="/root/acets-review-apps/environments/15/metrics"> Memory </a> usage is <b> unchanged </b> at 0MB',
+  hasMetrics: 'Memory  usage is  unchanged  at 0MB',
   loadFailed: 'Failed to load deployment statistics',
   metricsUnavailable: 'Deployment statistics are not available currently',
 };

spec/requests/api/runner_spec.rb

@@ -408,7 +408,7 @@ describe API::Runner do
             expect(json_response['image']).to eq({ 'name' => 'ruby:2.1', 'entrypoint' => '/bin/sh' })
             expect(json_response['services']).to eq([{ 'name' => 'postgres', 'entrypoint' => nil,
                                                        'alias' => nil, 'command' => nil },
-                                                     { 'name' => 'docker:dind', 'entrypoint' => '/bin/sh',
+                                                     { 'name' => 'docker:stable-dind', 'entrypoint' => '/bin/sh',
                                                        'alias' => 'docker', 'command' => 'sleep 30' }])
             expect(json_response['steps']).to eq(expected_steps)
             expect(json_response['artifacts']).to eq(expected_artifacts)

vendor/gitlab-ci-yml/Chef.gitlab-ci.yml

@@ -7,7 +7,7 @@
 
 image: "chef/chefdk"
 services:
-  - docker:dind
+  - docker:stable-dind
 
 variables:
   DOCKER_HOST: "tcp://docker:2375"

vendor/gitlab-ci-yml/Docker.gitlab-ci.yml

@@ -2,7 +2,7 @@
 image: docker:latest
 
 services:
-  - docker:dind
+  - docker:stable-dind
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

yarn.lock

@@ -54,9 +54,9 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@gitlab-org/gitlab-svgs@^1.17.0":
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.17.0.tgz#d0c74d9e44c127ccfad16941f352088b86f86c89"
+"@gitlab-org/gitlab-svgs@^1.18.0":
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.18.0.tgz#7829f0e6de0647dace54c1fcd597ee3424afb233"
 
 "@types/jquery@^2.0.40":
   version "2.0.48"