summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMek Stittri <mstittri@gitlab.com>2019-02-07 21:35:50 +0000
committerMek Stittri <mstittri@gitlab.com>2019-02-07 21:35:50 +0000
commite2966a6d8c5d26b8f7d71bfbacb54162bfa6567f (patch)
tree37f7a34a565df2e813000a614c68e0ed5a0f6b6d
parent132e461db255112efc9d3bc2d260b3be838837b3 (diff)
parent9f747da108d66d64096b49a7ed62e7c70979e13e (diff)
downloadgitlab-ce-e2966a6d8c5d26b8f7d71bfbacb54162bfa6567f.tar.gz
Merge branch 'leipert-fix-webpack-bundle' into 'master'
Fix increased package size of public/assets Closes gitlab-org/distribution/team-tasks#310 See merge request gitlab-org/gitlab-ce!25018
-rw-r--r--.gitlab-ci.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b93a79de994..c14fb0c2028 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -636,7 +636,6 @@ gitlab:assets:compile:
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
dependencies:
- setup-test-env
- - compile-assets
services:
- docker:stable-dind
variables: