summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jej-lint-scripts-and-config' into 'master'dz-nested-groups-docsDouwe Maan2017-02-081-0/+1
|\ | | | | | | | | | | | | Syntax linting for init scripts Closes #27787 See merge request !9054
| * CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-configJames Edwards-Jones2017-02-071-0/+1
| |
* | Don't fail the build if there is no coverage filesRémy Coutable2017-02-071-3/+3
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-311-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
| * Ensure rake is called within the correct bundle contextensure-rake-is-called-within-the-correct-bundle-contextLuke "Jared" Bennett2017-01-301-4/+4
| |
* | update rake tasksMike Greiling2017-01-281-2/+1
| |
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Improved code style on the issue_sidebar_spec.rb add CHAGELOG.md entry for !8831 remove assets:compile step from relative_url docs update scripts and docs to reference the newly namespaced rake task namespace assets rake tasks to gitlab:assets:* correct gzip files if they exist as well automatically correct CSS urls on assets:precompile remove hard-coded assets path for ace editor modules Fixed cancel button in the services form not redirecting back to the integrations settings view Fix search bar search param encoding Fix a transient failure in the `Explore::ProjectsController` spec Fix filtering with multiple words Fix project name label's for reference in project settings Fixed merge request tabs extra margin Don't call `#uniq` on a relation Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/ Move ApplicationSetting DEFAULTS to `.defaults` instead Move a begin/rescue clause to ApplicationSetting.expire Use badge partial as single source of truth instead of having 2 partials doing the same Changes after review ...
| * update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-271-1/+1
| |
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (389 commits) Document "No gems fetched from git repositories" policy [ci skip] Typos Small gramatical tweaks Typos Added PHP & NPM doc Use `:empty_project` where possible in request specs Add caching of droplab ajax requests Use `:empty_project` where possible in model specs Revert 3f17f29a Remove unused js response from refs controller Add MR id to changelog entry fixed small mini pipeline graph line glitch Prevent form to be submitted twice Fix Error 500 when repositories contain annotated tags pointing to blobs Fix /explore sorting (trending) Simplify wording in "adding an image" docs Remove "official merge window" from CONTRIBUTING.md [ci skip] Update repository check documentation Fixed flexbox and wrap issues Update two_factor_authentication.md ...
| * remove 2gb tag from ciah-remove-2gb-tagAlex Hanselka2017-01-201-1/+0
| |
* | optimize gitlab ci to only run npm install onceMike Greiling2017-01-151-3/+4
| |
* | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-131-1/+7
|\ \ | |/
| * Update rubocop and rubocop-rspec to fix build errorsupdate-rubocopBrian Neel2017-01-061-1/+7
| |
* | remove remaining vestiges of teaspoon test runnerMike Greiling2017-01-101-2/+1
| |
* | move webpack asset compilation to the setup-test-env stageMike Greiling2017-01-101-4/+5
| |
* | Swapped out teaspoon for karmaLuke "Jared" Bennett2017-01-101-8/+4
| |
* | precompile webpack assets when testingMike Greiling2017-01-101-0/+5
|/
* Fix build failure links in Slackfix-build-failure-linksSean McGivern2016-12-261-1/+1
|
* add new runner script attempts docs and update .gitlab-ci.ymlJames Lopez2016-12-151-0/+1
|
* Run builds with runners with tags gitlab-org and 2gbbuild-with-gitlab-ce-ee-runnersKamil Trzcinski2016-12-061-39/+69
|
* Bump ruby versionzj-use-ruby-2-3-3Z.J. van de Weg2016-12-031-5/+3
|
* Disable the ee_compat_check task on devRémy Coutable2016-11-301-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 Coutable2016-11-231-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-ymlZ.J. van de Weg2016-11-231-2/+2
| |
* | Merge branch 'zj-notify-development' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ | |/ |/| | | | | Notify broken master on #development See merge request !7593
| * Notify broken master on #development zj-notify-developmentZeger-Jan van de Weg2016-11-181-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)winniehell2016-11-221-2/+21
| |
* | Merge branch 'add-node-modules-cache-to-npm-related-builds' into 'master' Robert Speicher2016-11-221-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-buildsLuke "Jared" Bennett2016-11-191-2/+10
| |/
* | Revert "Test only migrations"Kamil Trzcinski2016-11-211-0/+363
| | | | | | | | This reverts commit 23fc7875a838b072b8869efada6f68a3a19fc9a6.
* | Fetch only one revisionKamil Trzcinski2016-11-211-3/+2
| |
* | Test only migrationsKamil Trzcinski2016-11-211-363/+0
| |
* | Fix migration paths testsKamil Trzcinski2016-11-211-1/+1
|/
* tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the ↵Nick Thomas2016-11-161-2/+13
| | | | prepare stage
* Also test on dev.gitlab [ci skip]zj-update-ciZ.J. van de Weg2016-11-121-1/+9
|
* Only run builds on master of CE or EEZ.J. van de Weg2016-11-121-4/+6
|
* Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-101-1/+14
| | | | | | ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* Replace trigger with the new ID of the docs projectAchilleas Pipinellis2016-11-071-1/+1
| | | | [ci skip]
* 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
| | |
View Lorry Controller Status