| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix build failure links in Slackfix-build-failure-links | Sean McGivern | 2016-12-26 | 1 | -1/+1 |
| | | |||||
| * | add new runner script attempts docs and update .gitlab-ci.yml | James Lopez | 2016-12-15 | 1 | -0/+1 |
| | | |||||
| * | Run builds with runners with tags gitlab-org and 2gbbuild-with-gitlab-ce-ee-runners | Kamil Trzcinski | 2016-12-06 | 1 | -39/+69 |
| | | |||||
| * | Bump ruby versionzj-use-ruby-2-3-3 | Z.J. van de Weg | 2016-12-03 | 1 | -5/+3 |
| | | |||||
| * | Disable the ee_compat_check task on dev | Rémy Coutable | 2016-11-30 | 1 | -1/+0 |
| | | | | | | | | We usually use it for security fixes that don't need to be ported to EE and the task seems to hang when run against the security branch. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'zj-fix-flags-usage-gitlab-ci-yml' into 'master' | Rémy Coutable | 2016-11-23 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Fix BASH usage in the .gitlab-ci.yml As discussed on Slack. Even though I created the fix, I was a mere code monkey in this case. See merge request !7693 | ||||
| | * | Fix BASH usage in the .gitlab-ci.ymlzj-fix-flags-usage-gitlab-ci-yml | Z.J. van de Weg | 2016-11-23 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'zj-notify-development' into 'master' | Sean McGivern | 2016-11-23 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | Notify broken master on #development See merge request !7593 | ||||
| | * | Notify broken master on #development zj-notify-development | Zeger-Jan van de Weg | 2016-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | AKA: - move all conversations to #core - beating will continue until morale improves - Learn by pain - Pain driven development | ||||
| * | | Generate ESLint HTML report (!7374) | winniehell | 2016-11-22 | 1 | -2/+21 |
| | | | |||||
| * | | Merge branch 'add-node-modules-cache-to-npm-related-builds' into 'master' | Robert Speicher | 2016-11-22 | 1 | -2/+10 |
| |\ \ | | | | | | | | | | | | | Add node_modules cache to npm related builds See merge request !7548 | ||||
| | * | | Add node_modules cache to npm related buildsadd-node-modules-cache-to-npm-related-builds | Luke "Jared" Bennett | 2016-11-19 | 1 | -2/+10 |
| | |/ | |||||
| * | | Revert "Test only migrations" | Kamil Trzcinski | 2016-11-21 | 1 | -0/+363 |
| | | | | | | | | | This reverts commit 23fc7875a838b072b8869efada6f68a3a19fc9a6. | ||||
| * | | Fetch only one revision | Kamil Trzcinski | 2016-11-21 | 1 | -3/+2 |
| | | | |||||
| * | | Test only migrations | Kamil Trzcinski | 2016-11-21 | 1 | -363/+0 |
| | | | |||||
| * | | Fix migration paths tests | Kamil Trzcinski | 2016-11-21 | 1 | -1/+1 |
| |/ | |||||
| * | tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the ↵ | Nick Thomas | 2016-11-16 | 1 | -2/+13 |
| | | | | | prepare stage | ||||
| * | Also test on dev.gitlab [ci skip]zj-update-ci | Z.J. van de Weg | 2016-11-12 | 1 | -1/+9 |
| | | |||||
| * | Only run builds on master of CE or EE | Z.J. van de Weg | 2016-11-12 | 1 | -4/+6 |
| | | |||||
| * | Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3 | Rémy Coutable | 2016-11-10 | 1 | -1/+14 |
| | | | | | | | ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Replace trigger with the new ID of the docs project | Achilleas Pipinellis | 2016-11-07 | 1 | -1/+1 |
| | | | | | [ci skip] | ||||
| * | Replace static issue fixtures by script (!6059) | winniehell | 2016-10-28 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'eslint' into 'master' | Fatih Acet | 2016-10-26 | 1 | -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 errors | winniehell | 2016-10-26 | 1 | -1/+0 |
| | | | |||||
| | * | add JavaScript linting to CI (!5445) | winniehell | 2016-10-26 | 1 | -0/+9 |
| | | | |||||
| * | | Merge branch 'dont-test-ee_compat_check-on-master' into 'master' | Robert Speicher | 2016-10-26 | 1 | -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 master | Rémy Coutable | 2016-10-26 | 1 | -0/+1 |
| | |/ | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'docs-trigger-variable' into 'master' | Achilleas Pipinellis | 2016-10-26 | 1 | -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-variable | Achilleas Pipinellis | 2016-10-25 | 1 | -1/+1 |
| | | | |||||
| | * | Use the alpine Docker image for docs trigger | Achilleas Pipinellis | 2016-10-25 | 1 | -2/+4 |
| | | | |||||
| | * | Add a variable to docs trigger and set Git strategy to none | Achilleas Pipinellis | 2016-10-25 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'troubleshoot-migration-paths' into 'master' | Stan Hu | 2016-10-25 | 1 | -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-paths | Grzegorz Bizon | 2016-10-25 | 1 | -4/+5 |
| | | | | |||||
| | * | | Keep the new resque.yml aside and use it once we've checked out master | Rémy Coutable | 2016-10-25 | 1 | -0/+3 |
| | |/ | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Change the approach to check if patches apply cleanly | Rémy Coutable | 2016-10-21 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 1 | -1/+4 |
| |\ | |||||
| | * | Fix retries | Kamil Trzcinski | 2016-10-14 | 1 | -1/+1 |
| | | | |||||
| | * | Re-run specs if failed | Kamil Trzcinski | 2016-10-14 | 1 | -1/+1 |
| | | | |||||
| | * | Remove spinach retry. | Connor Shea | 2016-10-14 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'trigger-docs-yaml' into 'master' | Achilleas Pipinellis | 2016-10-13 | 1 | -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-yaml | Achilleas Pipinellis | 2016-10-13 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix column limit on mysql | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Improve the branch existence and merge checksce-to-ee-merge-check-rake-task | Rémy Coutable | 2016-10-13 | 1 | -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 task | Rémy Coutable | 2016-10-13 | 1 | -0/+7 |
| |/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'cache-gems-for-tags' into 'master' | Robert Speicher | 2016-10-13 | 1 | -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 tags | Jacob Vosmaer | 2016-09-30 | 1 | -0/+13 |
| | | | |||||
| * | | Add job to trigger a docs.gitlab.com buildtrigger-docs | Achilleas Pipinellis | 2016-10-13 | 1 | -0/+8 |
| | | | |||||
| * | | Merge branch 'sh-add-bundle-check' into 'master' 21153-selecting-no-one-in-branch-permissions-is-confusing | Rémy Coutable | 2016-10-12 | 1 | -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-check | Stan Hu | 2016-10-12 | 1 | -1/+6 |
| | | | | |||||
| | * | | Add a bundle check step to ensure dependencies are correct | Stan Hu | 2016-10-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This should help prevent merge issues in the future, which caused !6814 to be needed. | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/.gitlab-ci.yml