summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-11-16 22:05:03 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-11-16 22:05:03 +0000
commit85bc7844d626675e963a6ed7b306390eeb82ad83 (patch)
tree0ed7d327508e14993e58b89b1448beee03151fae
parent50e6cc11f8f4f535d8c012661695db595a7cc513 (diff)
parent87dec8dd28981f97c836768e9d374aa9ce5f2852 (diff)
downloadgitlab-ce-85bc7844d626675e963a6ed7b306390eeb82ad83.tar.gz
Merge branch 'winh-application-css-pages' into 'master'
Provide application.css from master branch via GitLab Pages Closes gitlab-ui#95 See merge request gitlab-org/gitlab-ce!23156
-rw-r--r--.gitlab-ci.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3319bff1460..b2d75a829fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -821,6 +821,8 @@ pages:
- mv coverage-javascript/ public/coverage-javascript/ || true
- mv eslint-report.html public/ || true
- mv webpack-report/ public/webpack-report/ || true
+ - cp .public/assets/application-*.css public/application.css || true
+ - cp .public/assets/application-*.css.gz public/application.css.gz || true
artifacts:
paths:
- public