diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-03-05 14:12:00 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-05 14:12:00 +0000 |
| commit | b3506d2f1e49c76600e4c07cf837758609bcaabe (patch) | |
| tree | 5bb1cf4a66990ecea63bcc17b0c7f2a5013b5df8 /.gitlab-ci.yml | |
| parent | ed41f4e6ea6d1a016314823a805fab41aa8d867b (diff) | |
| download | gitlab-ce-b3506d2f1e49c76600e4c07cf837758609bcaabe.tar.gz | |
Revert "Merge branch 'gitlab-ui-visual' into 'master'"
This reverts commit 34293b5af83af03e8c814f488be8c31e37ff5be3, reversing
changes made to fdcfae2a92ac105d458e6f9617c1f22229ef34b6.
Conflicts:
.gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 853c10c5df6..2329c9c6edc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -672,29 +672,6 @@ gitlab:assets:compile: - docker - gitlab-org -gitlab:ui:visual: - tags: - - gitlab-org - before_script: [] - dependencies: - - compile-assets - script: - # Remove node modules from GitLab that may conflict with gitlab-ui - - rm -r node_modules - - git clone https://gitlab.com/gitlab-org/gitlab-ui.git - - cp public/assets/application-*.css gitlab-ui/styles/application.css - - cd gitlab-ui - - yarn install - - CSS_URL=./application.css yarn test - only: - changes: - - app/assets/stylesheets/*.scss - - app/assets/stylesheets/**/*.scss - - app/assets/stylesheets/**/**/*.scss - artifacts: - paths: - - tests/__image_snapshots__/ - karma: <<: *dedicated-no-docs-pull-cache-job <<: *use-pg |