summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Properly expand gitattributes binary macrodm-gitattributes-binary-macroDouwe Maan2017-06-071-11/+10
|
* Merge branch 'gitaly-0.11.0' into 'master'Sean McGivern2017-06-071-1/+1
|\ | | | | | | | | Use Gitaly 0.11.0 See merge request !11966
| * Use Gitaly 0.11.0Jacob Vosmaer2017-06-071-1/+1
| |
* | Merge branch 'issue_27166_2' into 'master'Douwe Maan2017-06-074-6/+37
|\ \ | | | | | | | | | | | | Avoid repeated queries for pipeline builds on merge requests See merge request !11888
| * | Avoid repeated queries for pipeline builds on merge requestsissue_27166_2Felipe Artur2017-06-064-6/+37
| | |
* | | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-078-23/+128
|\ \ \ | | | | | | | | | | | | | | | | Fix Diff::Position#diff_file for positions on straight diffs See merge request !11947
| * | | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-068-23/+128
| | | |
* | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-0729-162/+365
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist stages in the database Closes #26481 See merge request !11790
| * | | | Fix retry build service specs related to the stagefeature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-071-3/+15
| | | | |
| * | | | Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-06204-1836/+4140
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
| * | | | | Add changelog for persistent stages improvementGrzegorz Bizon2017-06-061-0/+4
| | | | | |
| * | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-062-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Fix reverting builds stage ref migration on MySQL
| * | | | | | Clone stage_id when retrying a CI/CD jobGrzegorz Bizon2017-06-062-3/+2
| | | | | | |
| * | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-069-51/+60
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Migrate stages only with correct foreign references Create index on pipeline stages after migrating stages Improve indexes and refs in pipeline stages migrations Fix typo in build stages reference migration Improve order of columns in pipeline stages table Make pipeline stages ref migration more readable
| * | | | | | | Improve specs for pipeline and pipeline seedsGrzegorz Bizon2017-06-052-3/+3
| | | | | | | |
| * | | | | | | Fix typo in import/export safe model attributesGrzegorz Bizon2017-06-051-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-055-6/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Use the latest migration version as a schema version Remove stage index concurrently on migration rollback Disable timeouts in foreign keys for stages migration Remove obsolete stages/build before adding foreign keys Create indexes on pipeline stages before migration Migrate stage_id only it job does not have it already Migrate pipeline stages only when not migrated already
| * \ \ \ \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-054-5/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Calculate previous migration version in specs support Conflicts: spec/spec_helper.rb
| * | | | | | | | | Add assertions about new pipeline stage in specsGrzegorz Bizon2017-06-051-0/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-051053-6751/+20984
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: app/serializers/pipeline_entity.rb db/schema.rb spec/factories/ci/stages.rb spec/lib/gitlab/import_export/safe_model_attributes.yml spec/services/ci/create_pipeline_service_spec.rb spec/spec_helper.rb
| * | | | | | | | | | Export pipeline stages in import/export featureGrzegorz Bizon2017-06-054-0/+16
| | | | | | | | | | |
| * | | | | | | | | | Revert invalid changes in new pipeline service specsGrzegorz Bizon2017-06-051-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Remove legacy method from pipeline classGrzegorz Bizon2017-06-051-11/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix invalid conditional in pipeline create serviceGrzegorz Bizon2017-06-023-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-0212-205/+172
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-012-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Use stage_id column in code that needs to know about it
| * | | | | | | | | | | Fix exposing legacy stages in pipeline entityGrzegorz Bizon2017-06-011-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Rename `Ci::Stage` class to `Ci::LegacyStage`Grzegorz Bizon2017-06-015-7/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-018-23/+23
| | | | | | | | | | | |
| * | | | | | | | | | | Expose pipeline stage seeds from pipeline instanceGrzegorz Bizon2017-05-312-5/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Return stage seeds object from YAML processorGrzegorz Bizon2017-05-315-26/+34
| | | | | | | | | | | |
| * | | | | | | | | | | Refine pipeline stages seeds classGrzegorz Bizon2017-05-315-86/+121
| | | | | | | | | | | |
| * | | | | | | | | | | Add stage seed class that represents attributesGrzegorz Bizon2017-05-303-2/+86
| | | | | | | | | | | |
| * | | | | | | | | | | Remove legacy method from create build serviceGrzegorz Bizon2017-05-302-8/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Expose stage model attributes from pipeline objectGrzegorz Bizon2017-05-303-2/+26
| | | | | | | | | | | |
| * | | | | | | | | | | Rename pipeline service that creates stages and jobsGrzegorz Bizon2017-05-302-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Implement CI/CD config attributes for persisted stagesGrzegorz Bizon2017-05-303-4/+53
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into 'master'Kamil Trzciński2017-06-0713-2/+292
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate pipeline stages in the database See merge request !11714
| * | | | | | | | | | | Merge commit '6ac1caa01a4c059f5bcb7c9da2e83001e5469f73' into ↵feature/gb/migrate-pipeline-stagesGrzegorz Bizon2017-06-06204-1836/+4140
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/migrate-pipeline-stages * commit '6ac1caa01a4c059f5bcb7c9da2e83001e5469f73': (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
| * | | | | | | | | | | Fix reverting builds stage ref migration on MySQLGrzegorz Bizon2017-06-062-2/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Migrate stages only with correct foreign referencesGrzegorz Bizon2017-06-063-4/+23
| | | | | | | | | | |
| * | | | | | | | | | Create index on pipeline stages after migrating stagesGrzegorz Bizon2017-06-061-0/+0
| | | | | | | | | | |
| * | | | | | | | | | Improve indexes and refs in pipeline stages migrationsGrzegorz Bizon2017-06-065-43/+31
| | | | | | | | | | |
| * | | | | | | | | | Fix typo in build stages reference migrationGrzegorz Bizon2017-06-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Improve order of columns in pipeline stages tableGrzegorz Bizon2017-06-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Make pipeline stages ref migration more readableGrzegorz Bizon2017-06-061-3/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Use the latest migration version as a schema versionGrzegorz Bizon2017-06-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove stage index concurrently on migration rollbackGrzegorz Bizon2017-06-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Disable timeouts in foreign keys for stages migrationGrzegorz Bizon2017-06-051-0/+2
| | | | | | | | | |
| * | | | | | | | | Remove obsolete stages/build before adding foreign keysGrzegorz Bizon2017-06-051-0/+16
| | | | | | | | | |