summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.8.0-rc11v10.8.0-rc11Mayra Cabrera2018-05-161-1/+1
|
* Merge branch '10-8-stable-prepare-rc11' into '10-8-stable'Mayra Cabrera2018-05-162-4/+8
|\ | | | | | | | | Prepare 10.8 RC11 release See merge request gitlab-org/gitlab-ce!18988
| * Merge branch 'fix-metrics-doorkeeper' into 'master'Nick Thomas2018-05-162-4/+8
|/ | | | | | | Fix GitLab Performance Monitoring content types for Doorkeeper Closes #46412 See merge request gitlab-org/gitlab-ce!18984
* Update VERSION to 10.8.0-rc10v10.8.0-rc10Mayra Cabrera2018-05-151-1/+1
|
* Merge branch '10-8-stable-prepare-rc10' into '10-8-stable'Mayra Cabrera2018-05-158-20/+28
|\ | | | | | | | | Prepare 10.8 RC10 release See merge request gitlab-org/gitlab-ce!18966
| * Merge branch 'fix-metrics-content-types' into 'master'Stan Hu2018-05-153-16/+9
| | | | | | | | | | | | | | Fix setting Gitlab metrics content types Closes gitlab-com/infrastructure#3499 See merge request gitlab-org/gitlab-ce!18975
| * Merge branch '46286-fix-ingress-rbac-default-value' into 'master'Kamil Trzciński2018-05-152-0/+10
| | | | | | | | | | | | | | Disable RBAC on Ingress by default Closes #46286 See merge request gitlab-org/gitlab-ce!18947
| * Merge branch '46345-kubernetes-popover-illustration-skewed' into 'master'Filipa Lacerda2018-05-153-4/+9
|/ | | | | | | Correct skewed Kubernetes popover illustration Closes #46345 See merge request gitlab-org/gitlab-ce!18949
* Update VERSION to 10.8.0-rc9v10.8.0-rc9Mayra Cabrera2018-05-141-1/+1
|
* Merge branch '10-8-stable-prepare-rc9' into '10-8-stable'Mayra Cabrera2018-05-148-22/+78
|\ | | | | | | | | Prepare 10.8 RC9 release See merge request gitlab-org/gitlab-ce!18942
| * Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-141-5/+0
| | | | | | | | | | Remove duplicate method See merge request gitlab-org/gitlab-ce!18886
| * Merge branch ↵Douwe Maan2018-05-145-17/+55
| | | | | | | | | | | | | | 'backport-rd-5566-improve-performance-of-repository-size-limit-check' into 'master' Backport some changes from gitlab-ee!5476 See merge request gitlab-org/gitlab-ce!18760
| * Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-142-2/+25
| | | | | | | | | | | | | | Allow a user to sign out when on the terms page Closes #46211 See merge request gitlab-org/gitlab-ce!18875
| * Merge branch 'jl-update-runner-links-docs' into 'master'Achilleas Pipinellis2018-05-141-3/+3
|/ | | | | Update runner links to repo based on restructuring See merge request gitlab-org/gitlab-ce!18919
* Update VERSION to 10.8.0-rc8v10.8.0-rc8Filipa Lacerda2018-05-111-1/+1
|
* Merge branch '10-8-stable-prepare-rc8' into '10-8-stable'Filipa Lacerda2018-05-1126-210/+413
|\ | | | | | | | | Prepare 10.8 RC8 release See merge request gitlab-org/gitlab-ce!18883
| * Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-112-0/+106
| | | | | | | | | | | | | | Enforce terms acceptance before configuring 2FA Closes #46256 See merge request gitlab-org/gitlab-ce!18896
| * Merge branch 'vendor-auto-devops-template' into 'master'Kamil Trzciński2018-05-111-36/+18
| | | | | | | | | | Vendor Auto DevOps template See merge request gitlab-org/gitlab-ce!18876
| * Merge branch '10-8-stable-prepare-rc8-fix-conflict-for-18874' into ↵James Lopez2018-05-112-8/+28
| |\ | | | | | | | | | | | | | | | | | | '10-8-stable-prepare-rc8' Fixes conflict when picking into prep branch See merge request gitlab-org/gitlab-ce!18900
| | * Fix conflict in spec/models/ci/runner_spec.rbDylan Griffith2018-05-111-6/+1
| | |
| | * Merge branch 'correct-runner-type-when-assigning-shared-to-project' into ↵Kamil Trzciński2018-05-112-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure runner_type is updated correctly when assigning shared runner to project See merge request gitlab-org/gitlab-ce!18874
| * | Merge branch 'ide-mr-open-file-fix' into 'master'Filipa Lacerda2018-05-113-2/+27
| |/ | | | | | | | | Fixed none merge request files not being openable in the web IDE See merge request gitlab-org/gitlab-ce!18881
| * Merge branch '46210-terms-acceptance-dropdown-menu' into 'master'Tim Zallmann2018-05-113-4/+14
| | | | | | | | | | | | | | Resolve "Terms acceptance dropdown menu" Closes #46210 See merge request gitlab-org/gitlab-ce!18862
| * Update schema versionMayra Cabrera2018-05-101-1/+1
| |
| * Merge branch 'bw-fix-sha-attribute' into 'master'Stan Hu2018-05-102-5/+8
| | | | | | | | | | ShaAttribute crashes with ArgumentError if column doesn't exist See merge request gitlab-org/gitlab-ce!18880
| * Merge branch 'fix/wiki-find-page-invalid-encoding' into 'master'Robert Speicher2018-05-104-1/+31
| | | | | | | | | | | | | | Fix finding wiki pages when they have invalidly-encoded content Closes #43715 See merge request gitlab-org/gitlab-ce!18856
| * Merge branch 'jr-46209-web-ide-copy' into 'master'Tim Zallmann2018-05-102-2/+7
| | | | | | | | | | Fix outdated web ide copy See merge request gitlab-org/gitlab-ce!18861
| * Merge branch '46147-remove-model-redefinition-worker' into 'master'Douwe Maan2018-05-102-149/+95
| | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `uploader_context' for #<ObjectStorage::MigrateUploadsWorker::Upload:0x00007f59e..." Closes #46147 See merge request gitlab-org/gitlab-ce!18820
| * Merge branch 'fix-project-mirror-data-schema' into 'master'Douwe Maan2018-05-105-2/+78
|/ | | | | Fix project mirror data schema See merge request gitlab-org/gitlab-ce!18811
* Update VERSION to 10.8.0-rc7v10.8.0-rc7Filipa Lacerda2018-05-101-1/+1
|
* Update VERSION to 10.8.0-rc6v10.8.0-rc610-8-stable-prepare-rc7Mayra Cabrera2018-05-091-1/+1
|
* Merge branch '10-8-stable-prepare-rc6' into '10-8-stable'Mayra Cabrera2018-05-093-8/+46
|\ | | | | | | | | Prepare 10.8 RC6 release See merge request gitlab-org/gitlab-ce!18859
| * Merge branch '45840-fix-cache-key-docs' into 'master'Achilleas Pipinellis2018-05-091-7/+11
| | | | | | | | | | | | | | Resolve "Incorrect documentation for .gitlab-ci.yml cache:key default value" Closes #45840 See merge request gitlab-org/gitlab-ce!18841
| * Merge branch 'fix/gb/add-tmp-index-to-improve-stages-migration-cleanup' into ↵Kamil Trzciński2018-05-091-1/+34
| | | | | | | | | | | | | | | | | | 'master' Add tmp index to ci_builds to optimize stages migration Closes #46179 See merge request gitlab-org/gitlab-ce!18844
| * Merge branch 'fix/gb/add-missing-foreign-key-to-database-schema' into 'master'Kamil Trzciński2018-05-091-0/+1
|/ | | | | Add missing pipeline build foreign key to the schema See merge request gitlab-org/gitlab-ce!18846
* Update VERSION to 10.8.0-rc5v10.8.0-rc5Filipa Lacerda2018-05-091-1/+1
|
* Merge branch '10-8-stable-prepare-rc5' into '10-8-stable'James Lopez2018-05-0937-203/+444
|\ | | | | | | | | Prepare 10.8 RC5 release See merge request gitlab-org/gitlab-ce!18839
| * Merge branch 'fix-ide-empty-editor' into 'master'Filipa Lacerda2018-05-094-3/+25
| | | | | | | | | | | | | | Fixed empty editors in the IDE Closes #46153 See merge request gitlab-org/gitlab-ce!18842
| * Merge branch 'cherry-pick-7b8d754e-ce' into 'master'Grzegorz Bizon2018-05-091-1/+1
| | | | | | | | | | Adjust spec to build correct path when storage path ends in slash See merge request gitlab-org/gitlab-ce!18843
| * Merge branch '10-8-update-gitignore' into 'master'James Lopez2018-05-0912-15/+27
| | | | | | | | | | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!18845
| * Merge branch '10-8-dependencies-update' into 'master'James Lopez2018-05-091-162/+234
| | | | | | | | | | Update the dependencies license list See merge request gitlab-org/gitlab-ce!18847
| * Merge branch '10244-group-runner-docs' into 'master'Achilleas Pipinellis2018-05-091-3/+14
| | | | | | | | | | | | | | Add docs for group runners Closes #10244 See merge request gitlab-org/gitlab-ce!18807
| * Merge branch '45819_update_container_scanning_gitlab_ci_config_doc' into ↵Achilleas Pipinellis2018-05-091-1/+1
| | | | | | | | | | | | | | | | | | 'master' Updates Clair container scanning GitLab CI configuration Closes #45819 See merge request gitlab-org/gitlab-ce!18614
| * Merge branch 'add-runner-type-to-cluster-app' into 'master'Grzegorz Bizon2018-05-092-3/+10
| | | | | | | | | | Set `runner_type` for cluster/application See merge request gitlab-org/gitlab-ce!18832
| * Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-092-3/+3
| | | | | | | | | | Cleanly handle plural name for ghost user migration See merge request gitlab-org/gitlab-ce!18798
| * Merge branch 'fix/gb/add-pipeline-builds-foreign-key' into 'master'Kamil Trzciński2018-05-094-0/+74
| | | | | | | | | | | | | | Add database foreign key between pipelines and builds Closes #46035 See merge request gitlab-org/gitlab-ce!18822
| * Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into ↵Stan Hu2018-05-095-6/+32
| | | | | | | | | | | | | | 'master' Raise InvalidRepository error for non-valid git repositories See merge request gitlab-org/gitlab-ce!18594
| * Merge branch 'ide-mr-icon-fixes' into 'master'Filipa Lacerda2018-05-091-2/+2
| | | | | | | | | | | | | | Fixed tooltip & spacing of merge request icon in IDE Closes #46121 and #46123 See merge request gitlab-org/gitlab-ce!18805
| * Merge branch ↵Nick Thomas2018-05-092-2/+13
| | | | | | | | | | | | | | | | | | '46130-ce-remote_mirrors-table-should-have-boolean-enabled-set-to-false' into 'master' Resolve "CE remote_mirrors table should have boolean enabled set to `false`" Closes #46130 See merge request gitlab-org/gitlab-ce!18801
| * Merge branch 'dm-ensure-import-state-persisted' into 'master'Grzegorz Bizon2018-05-091-2/+8
|/ | | | | Don't create import_state until project is persisted See merge request gitlab-org/gitlab-ce!18803
View Lorry Controller Status