summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
Commit message (Collapse)AuthorAgeFilesLines
* Replace static issue fixtures by script (!6059)winniehell2016-10-281-1/+1
|
* Merge branch 'eslint' into 'master' Fatih Acet2016-10-261-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ESLint ## What does this MR do? - create `package.json` - add ESLint dependencies to `package.json` - add JavaScript linting to CI - add Rake task `lint:javascript`as alias for `eslint` (which itself is an alias for `npm run eslint`) ## Are there points in the code the reviewer needs to double check? Probably not. ## Why was this MR needed? My hovercraft was full of eels. ## What are the relevant issue numbers? - https://gitlab.com/gitlab-org/gitlab-ce/issues/13224#note_12537431 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5006#note_13255658 See merge request !5445
| * make build fail for ESLint errorswinniehell2016-10-261-1/+0
| |
| * add JavaScript linting to CI (!5445)winniehell2016-10-261-0/+9
| |
* | Merge branch 'dont-test-ee_compat_check-on-master' into 'master' Robert Speicher2016-10-261-0/+1
|\ \ | | | | | | | | | | | | We don't need to run `ee_compat_check` against `master` See merge request !7119
| * | We don't need to run ee_compat_check against masterRémy Coutable2016-10-261-0/+1
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'docs-trigger-variable' into 'master' Achilleas Pipinellis2016-10-261-3/+8
|\ \ | |/ |/| | | | | Add a trigger variable to docs trigger job See merge request !7089
| * Restrict docs trigger job only to gitlab-org/gitlab-cedocs-trigger-variableAchilleas Pipinellis2016-10-251-1/+1
| |
| * Use the alpine Docker image for docs triggerAchilleas Pipinellis2016-10-251-2/+4
| |
| * Add a variable to docs trigger and set Git strategy to noneAchilleas Pipinellis2016-10-251-1/+4
| |
* | Merge branch 'troubleshoot-migration-paths' into 'master' Stan Hu2016-10-251-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `migration paths` CI job ## What does this MR do? It fixes the `migration paths` CI job. This job started failing at the time we added a migration that is actually using Redis. The issue was that the `config/resque.yml` file we're using is not back-compatible with the `v8.5.9` version we're checking out in the first part of the job, that's why we're using a UNIX socket for this version. To fix the issue: * We use 'SETUP_DB: 'false'` in the job variables to speed up the job (it does not make sense to run migration before checking out v8.5.9) * We just copy config/resque.yml.example to config/resque.yml at is simply has correct structure when checked out from v8.5.9 * When we revert to CI_BUILD_REF, we run prepare script again, which swaps config/resque.yml again, using new version this time. Fixes #23658. Note: the `migration paths` CI job is run on `master` only but you can see a successful build here: https://gitlab.com/gitlab-org/gitlab-ce/commit/fd99ec1a8ecc49ef70c4358ca7be2987f2a7505f See merge request !7092
| * | Improve redis config tasks for migration paths jobtroubleshoot-migration-pathsGrzegorz Bizon2016-10-251-4/+5
| | |
| * | Keep the new resque.yml aside and use it once we've checked out masterRémy Coutable2016-10-251-0/+3
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Change the approach to check if patches apply cleanlyRémy Coutable2016-10-211-1/+1
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-1/+4
|\
| * Fix retriesKamil Trzcinski2016-10-141-1/+1
| |
| * Re-run specs if failedKamil Trzcinski2016-10-141-1/+1
| |
| * Remove spinach retry.Connor Shea2016-10-141-1/+1
| |
| * Merge branch 'trigger-docs-yaml' into 'master' Achilleas Pipinellis2016-10-131-0/+3
| |\ | | | | | | | | | | | | | | | | | | Do not run before_script, artifacts, cache in trigger_docs job Fixes See merge request !6866
| | * Do not run before_script, artifacts, cache in trigger_docs jobtrigger-docs-yamlAchilleas Pipinellis2016-10-131-0/+3
| | |
* | | Fix column limit on mysqlAlfredo Sumaran2016-10-131-1/+1
|/ /
* | Improve the branch existence and merge checksce-to-ee-merge-check-rake-taskRémy Coutable2016-10-131-1/+1
| | | | | | | | | | | | Also add a safeguard for non-CI env. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Draft a quick CE->EE merge check rake taskRémy Coutable2016-10-131-0/+7
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'cache-gems-for-tags' into 'master' Robert Speicher2016-10-131-0/+13
|\ | | | | | | | | | | | | | | | | | | | | | | Keep a copy of gems needed by our releases as CI artifacts This is meant as insurance in case a gem GitLab needs is ever removed from rubygems.org. After we merge this, all future GitLab tags will have a CI artifact archive containing all the gems (for all platforms) specified in Gemfile.lock for that revision. Only runs on tags (so we don't constantly create 50MB gem cache bundles). See merge request !6617
| * Cache gems in CI on tagsJacob Vosmaer2016-09-301-0/+13
| |
* | Add job to trigger a docs.gitlab.com buildtrigger-docsAchilleas Pipinellis2016-10-131-0/+8
| |
* | Merge branch 'sh-add-bundle-check' into 'master' 21153-selecting-no-one-in-branch-permissions-is-confusingRémy Coutable2016-10-121-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Add a bundle check step to ensure dependencies are correct This should help prevent merge issues in the future, which caused !6814 to be needed. See merge request !6815
| * | Add a separate stage for bundle checksh-add-bundle-checkStan Hu2016-10-121-1/+6
| | |
| * | Add a bundle check step to ensure dependencies are correctStan Hu2016-10-121-0/+1
| | | | | | | | | | | | | | | This should help prevent merge issues in the future, which caused !6814 to be needed.
* | | Revert "Merge branch 'tests-use-tmpfs' into 'master'"Yorick Peterse2016-10-121-2/+0
|/ / | | | | This reverts merge request !6730
* | Try tmpfs for repository storage, etcNick Thomas2016-10-061-0/+2
| |
* | Don't allow flay to fail.cs-flay-no-allow-failureConnor Shea2016-10-051-3/+1
| |
* | Move the images over to dev.gitlab.orguse-custom-ruby-imagesZ.J. van de Weg2016-09-301-2/+2
| |
* | Update CI yaml and update CHANGELOG entryZ.J. van de Weg2016-09-301-2/+2
| |
* | remove unused cache from .gitlab-ci.ymlZ.J. van de Weg2016-09-301-2/+0
| |
* | Use custom Ruby images to test buildsKamil Trzcinski2016-09-301-2/+2
| | | | | | | | It allows us to remove redundant steps of installing required dependencies for every build.
* | Remove Flog as we use a Rubocop that does its job.cs-remove-flog-flayConnor Shea2016-09-281-3/+0
|/
* Limit test environment size to one project in CIGrzegorz Bizon2016-09-231-2/+2
|
* Improve CI job that tests database seedsGrzegorz Bizon2016-09-221-4/+4
|
* Try cloning repositories before seeding databaseGrzegorz Bizon2016-09-221-0/+2
| | | | | Seeding database requires gitlab-shell, and we would like to avoid adding this dependency to the CI.
* Add artifacts with development log when seed failsGrzegorz Bizon2016-09-221-0/+5
|
* Add development environment database setup CI testGrzegorz Bizon2016-09-221-6/+16
|
* Allow flay and flog to fail for nowStan Hu2016-09-141-2/+6
|
* Add haml_lint rake taskRémy Coutable2016-09-131-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Use haml_lint for views lintingRémy Coutable2016-09-131-0/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'enable-rspec-formatter' into 'master' Kamil Trzciński2016-09-081-1/+1
|\ | | | | | | | | | | | | Enable rspec documentation formatter and color output Current rspec just outputs a `=` as each test runs. This enables the documentation formatter and color output to make it easier to know what is going on with each spec. See merge request !5924
| * Add color to rspec outputenable-rspec-formatterStan Hu2016-08-201-1/+1
| |
| * Enable rspec documentation formatterStan Hu2016-08-201-1/+1
| |
* | Have CI test migration pathsZ.J. van de Weg2016-09-061-1/+15
|/ | | | | | | | | This commit adds a job to the pipeline to test if migration on seed data works. Even though the seed data is not perfect, it does give more guarentees that this will succeed in the real world too. seed_fu is used instead of dev:setup to save some time, as they both generate the data in the same way, this should be fine.
* Install latest stable phantomjsKamil Trzcinski2016-08-131-1/+1
|