summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-20766-4592/+14540
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (319 commits) remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules Add Esperanto translations of Pipeline Schedules Add Traditional Chinese in HongKong translations of Pipeline Schedules Add Simplified Chinese translations of Pipeline Schedules Resolve "Clarify k8s service keys" ... Conflicts: db/schema.rb
| * | | | | | | | | | | | | | | | | Update version number of stages statuses migrationGrzegorz Bizon2017-07-114-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix pipeline stages statuses migration specsGrzegorz Bizon2017-07-111-5/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Freeze mutable constants in stages migration codeGrzegorz Bizon2017-07-114-6/+4
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add a new stage status column to safe attributesGrzegorz Bizon2017-07-111-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Schedule stages statuses bg migrations in batchesGrzegorz Bizon2017-07-103-12/+16
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-101433-7558/+17195
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (587 commits) Increase GitLab QA screenshots size Fix QA test scenario for creating a new project Configure headless chrome screenshots correctly Allow passing exceptions when creating project services Also inject new route helpers into includers of GitlabRoutingHelper Remove many N+1 queries with merge requests API fix milestones finder failing spec Make wrong migrations idempotent Remove double border on last group row Update tests to test what the component renders and what the clicks calls Username and password are no longer stripped from import url on import Change `sign_out` usage to `gitlab_sign_out` in one spec Send Gitaly Repository with /api/internal/allowed Resolve "Liberation Mono weird font rendering on Fedora/openSUSE/other Linux distros" Force mobile view for admin projects fix spec Mark a subgroup-related spec as PostgreSQL-only Use vue .prevent to prevent the click Add members-list class to admin projects page Fix another typo in SHA attribute spec ... Conflicts: db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb db/schema.rb lib/gitlab/background_migration/migrate_build_stage_id_reference.rb spec/migrations/migrate_stage_id_reference_in_background_spec.rb
| * | | | | | | | | | | | | | | | | | Move stages status migration to the background workerbackstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-055-79/+122
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into ↔Grzegorz Bizon2017-07-057-7/+185
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/migrate-stages-statuses * fix/gb/stage-id-reference-background-migration: (22 commits) Reduce a delay between stage_id scheduled migrations Improve exception description in bg migrations Do not override original AR5 batching interface Sanitize id value passed to async background migration Improve code examples in background migrations docs Add description to exception in bg migrations worker Do not compare float with integer in migrations specs Improve readability of build stage id migration query Use integers to schedule delayed background migrations Test if argument passed to a migration is present Make `inline` a default sidekiq testing processing again Improve specs for background stage_id ref migration Perform stage_id ref backgound migration in bulks Remove unused background migrations matcher Use ActiveRecord 5 batching to schedule bg migration Make it possible to schedule bg migrations in bulk Add specs for delayed stage_id background migrations Schedule background migration only when it is needed Find builds that require a migration in batches Update `db/schema.rb` with a new schema version ...
| | * | | | | | | | | | | | | | | | | | Reduce a delay between stage_id scheduled migrationsGrzegorz Bizon2017-07-032-5/+5
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Improve exception description in bg migrationsGrzegorz Bizon2017-07-031-1/+3
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Do not override original AR5 batching interfaceGrzegorz Bizon2017-06-302-4/+7
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Sanitize id value passed to async background migrationGrzegorz Bizon2017-06-301-3/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Improve code examples in background migrations docsGrzegorz Bizon2017-06-301-4/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add description to exception in bg migrations workerGrzegorz Bizon2017-06-301-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Do not compare float with integer in migrations specsGrzegorz Bizon2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Improve readability of build stage id migration queryGrzegorz Bizon2017-06-292-8/+9
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Use integers to schedule delayed background migrationsGrzegorz Bizon2017-06-292-3/+3
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Test if argument passed to a migration is presentGrzegorz Bizon2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Make `inline` a default sidekiq testing processing againGrzegorz Bizon2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Improve specs for background stage_id ref migrationGrzegorz Bizon2017-06-292-12/+18
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Perform stage_id ref backgound migration in bulksGrzegorz Bizon2017-06-291-3/+3
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Remove unused background migrations matcherGrzegorz Bizon2017-06-291-12/+0
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Use ActiveRecord 5 batching to schedule bg migrationGrzegorz Bizon2017-06-294-36/+32
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Make it possible to schedule bg migrations in bulkGrzegorz Bizon2017-06-294-8/+70
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add specs for delayed stage_id background migrationsGrzegorz Bizon2017-06-282-7/+51
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Schedule background migration only when it is neededGrzegorz Bizon2017-06-281-4/+6
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Find builds that require a migration in batchesGrzegorz Bizon2017-06-282-3/+8
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update `db/schema.rb` with a new schema versionGrzegorz Bizon2017-06-281-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add initial build stage_id ref background migrationGrzegorz Bizon2017-06-283-7/+26
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add initial stage_id background migration filesGrzegorz Bizon2017-06-283-0/+54
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Disable statement timeout in stages statuses migrationGrzegorz Bizon2017-07-051-4/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Migrate only old stages without status that is setGrzegorz Bizon2017-07-041-1/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add a workaround for a tmp job -> stage relationGrzegorz Bizon2017-07-042-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still didn't migrate `ci_builds.stage_id`, so we can't use a belongs_to association. We also have `ci_builds.stage` string attribute, that we need to phase out in favor of `ci_stages.name`.
| * | | | | | | | | | | | | | | | | | | Add some validations to persisted stage modelGrzegorz Bizon2017-07-043-8/+11
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Use enumerated status in persisted stage classGrzegorz Bizon2017-07-045-2/+43
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add a test for stage status migration with retried jobsGrzegorz Bizon2017-07-041-4/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Implement initial working stages statuses migrationGrzegorz Bizon2017-07-042-37/+30
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Extend stages statuses migrationGrzegorz Bizon2017-07-041-21/+34
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add initial changes for stages statuses migrationGrzegorz Bizon2017-06-304-1/+137
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-annotations-update' into 'master'Douwe Maan2017-08-212-40/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git deletions and simplifications See merge request !13640
| * | | | | | | | | | | | | | | | | | | | Simplify return valuesgitaly-annotations-updateJacob Vosmaer2017-08-181-1/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Simplify method argumentsJacob Vosmaer2017-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | More annotationsJacob Vosmaer2017-08-181-0/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Delete unused Gitlab::Git methodsJacob Vosmaer2017-08-182-37/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add Gitaly annotationJacob Vosmaer2017-08-181-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-0.33.0' into 'master'Douwe Maan2017-08-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.33.0 See merge request !13671
| * | | | | | | | | | | | | | | | | | | | Use Gitaly 0.33.0gitaly-0.33.0Jacob Vosmaer2017-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'zj-remove-ci-api-v1' into 'master'Kamil TrzciƄski2017-08-2120-1903/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CI API v1 See merge request !13652
| * | | | | | | | | | | | | | | | | | | | | Fix broken links in documentationzj-remove-ci-api-v1Zeger-Jan van de Weg2017-08-212-6/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, move the old linting docs to the new location.