diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 16:20:17 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 16:20:17 +0800 |
| commit | 3aed06cfa387406c2e0257a8783bc05b53d4385a (patch) | |
| tree | 91d12caf54a468bc272d92bca4542722a42e2033 /.gitlab-ci.yml | |
| parent | 964814e99a30dd9fb0194e64cc01fee79bd027aa (diff) | |
| parent | c970fa973d482c50820db75d08d74bd5c1e9d475 (diff) | |
| download | gitlab-ce-3aed06cfa387406c2e0257a8783bc05b53d4385a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (590 commits)
Fixes failing spec
Fix icon name error
Rewrite system note helper
Change edit icon
Leave icon area blank if legacy note; remove diamond icon
Fix positioning of note icons
Fix newline errors
Add remaining system note icons
Add system notes icon helper; add icons
Fixed specs Updated JS that was causing the hints to appear & then disappear
Update tests
Fix broken spinach test
Reuse code
Improve shortcuts code
Adds ShortcutsDashboardNavigation to globals comment since its a global variable
Fix shortcut specs
Reorganize shortcut help menu
Change todos shortcut to shift
Change shortcuts
Switch global shortcuts to shift; reuse key styles from help menu
...
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a17438b2af2..3ceb0b4ba79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ cache: variables: MYSQL_ALLOW_EMPTY_PASSWORD: "1" RAILS_ENV: "test" + NODE_ENV: "test" SIMPLECOV: "true" GIT_DEPTH: "20" PHANTOMJS_VERSION: "2.1.1" @@ -159,9 +160,7 @@ setup-test-env: stage: prepare script: - node --version - - yarn --version - yarn install --pure-lockfile - - yarn check # ensure that yarn.lock matches package.json - bundle exec rake gitlab:assets:compile - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' artifacts: @@ -382,14 +381,31 @@ rake karma: paths: - coverage-javascript/ -lint-doc: +docs:check:apilint: + image: "phusion/baseimage" stage: test <<: *dedicated-runner - image: "phusion/baseimage:latest" + cache: {} + dependencies: [] before_script: [] script: - scripts/lint-doc.sh +docs:check:links: + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine" + stage: test + <<: *dedicated-runner + cache: {} + dependencies: [] + before_script: [] + script: + - mv doc/ /nanoc/content/ + - cd /nanoc + # Build HTML from Markdown + - bundle exec nanoc + # Check the internal links + - bundle exec nanoc check internal_links + bundler:check: stage: test <<: *dedicated-runner |