summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include integration tests in CE/EE testing documentationJoshua Lambert2018-01-041-1/+1
|
* Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-048-12/+402
|\ | | | | | | | | Use a background migration for migrating issues.closed_at See merge request gitlab-org/gitlab-ce!16083
| * Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-038-12/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous attempt (rolled back in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16021) we tried to migrate `issues.closed_at` from timestamp to timestamptz using a regular migration. This has a bad impact on GitLab.com and as such was rolled back. This commit re-implements the original migrations using generic background migrations, allowing us to still migrate the data in a single release but without a negative impact on availability. To ensure the database schema is up to date the background migrations are performed inline in development and test environments. We also make sure to not migrate that that doesn't need migrating in the first place or has already been migrated.
* | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-0442-98/+805
|\ \ | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * | Simplify metrics fetching for closed/merged MRsosw-introduce-merge-request-statisticsOswaldo Ferreira2018-01-031-6/+5
| | |
| * | Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-023-2/+9
| | | | | | | | | | | | closed/merged
| * | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-0242-98/+799
| | |
* | | Merge branch '41054-disable-creation-of-new-kubernetes-integrations' into ↵Kamil Trzciński2018-01-0418-14/+244
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 41054-Disallow creation of new Kubernetes integrations Closes #41054 See merge request gitlab-org/gitlab-ce!16017
| * | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-0418-14/+244
| | | |
* | | | Merge branch '40042-resizable-file-list-and-commit-panel' into 'master'Filipa Lacerda2018-01-0410-5/+262
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Resizable file list and commit panel" Closes #40042 See merge request gitlab-org/gitlab-ce!16178
| * | | Resolve "Resizable file list and commit panel"Tim Zallmann2018-01-0410-5/+262
|/ / /
* | | Merge branch 'use-heredoc-for-keys' into 'master'Grzegorz Bizon2018-01-042-34/+43
|\ \ \ | | | | | | | | | | | | | | | | Use heredoc for long strings so it's easier to read See merge request gitlab-org/gitlab-ce!16179
| * | | Use heredoc for long strings so it's easier to readuse-heredoc-for-keysLin Jen-Shin2018-01-032-34/+43
| | | |
* | | | Merge branch ↵Grzegorz Bizon2018-01-043-5/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
| * | | | Fix API endpoints to edit wiki pages where project belongs to a grouprd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-groupRubén Dávila2018-01-033-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases is prefered to manually create a ProjectWiki over using Project#wiki. This is because Project#wiki always uses the #owner (which is a User sometimes) as the author of the wiki changes but sometimes the owner is a Group and it doesn't respond to #username
* | | | | Merge branch ↵Kamil Trzciński2018-01-033-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature' into 'master' fix issue #37843 Closes #37843 See merge request gitlab-org/gitlab-ce!15902
| * | | | | fix issue #37843Danny2018-01-033-1/+10
|/ / / / /
* | | | | Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-032-0/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042
| * | | | | Set Auto Browser Performance Testing to 10.4update-autodevops-templateJoshua Lambert2017-12-211-1/+1
| | | | | |
| * | | | | Add docs for AutoDevOpsJoshua Lambert2017-12-211-0/+15
| | | | | |
| * | | | | Merge branch 'update-autodevops-template' of gitlab.com:gitlab-org/gitlab-ce ↵Joshua Lambert2017-12-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into update-autodevops-template
| | * | | | | Remove SAST:Image for now.Joshua Lambert2017-12-201-25/+0
| | | | | | |
| | * | | | | Update Auto DevOps templateJoshua Lambert2017-12-201-0/+70
| | | | | | |
| * | | | | | Remove SAST:Image for now.Joshua Lambert2017-12-211-25/+0
| | | | | | |
| * | | | | | Update Auto DevOps templateJoshua Lambert2017-12-211-0/+70
| | | | | | |
* | | | | | | Merge branch 'docs-update-doc-for-prometheus-and-kubernetes-integrations' ↵Kamil Trzciński 🎆 Back on Jan 2!2018-01-033-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Updates documentation for Prometheus and Kubernetes integration Closes #41432 See merge request gitlab-org/gitlab-ce!16156
| * | | | | | | Updates documentation for prometheus and kubernetes integrationdocs-update-doc-for-prometheus-and-kubernetes-integrationsMayra Cabrera2017-12-283-2/+6
| | | | | | | |
* | | | | | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into ↵Robert Speicher2018-01-0318-61/+259
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle GitLab hashed storage repositories using the repo import task Closes #39870 See merge request gitlab-org/gitlab-ce!16027
| * | | | | | | | Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-taskDouglas Barbosa Alexandre2018-01-031-3/+3
| | | | | | | | |
| * | | | | | | | Refactoring Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+6
| | | | | | | | |
| * | | | | | | | Remove unused variable from bare repository importer specDouglas Barbosa Alexandre2018-01-031-1/+0
| | | | | | | | |
| * | | | | | | | Refactoring spec for Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+11
| | | | | | | | |
| * | | | | | | | Fix Projects::TransferService#write_repository_config methodDouglas Barbosa Alexandre2018-01-031-1/+1
| | | | | | | | |
| * | | | | | | | Fix Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-032-3/+10
| | | | | | | | |
| * | | | | | | | Add spec for Project#write_repository_configDouglas Barbosa Alexandre2018-01-031-0/+22
| | | | | | | | |
| * | | | | | | | Write projects config to all projects inside namespace in batchesDouglas Barbosa Alexandre2018-01-032-3/+3
| | | | | | | | |
| * | | | | | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-037-41/+25
| | | | | | | | |
| * | | | | | | | Fix TestEnv.copy_repo to use disk_path instead of full_pathDouglas Barbosa Alexandre2018-01-033-3/+3
| | | | | | | | |
| * | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-01-031-0/+5
| | | | | | | | |
| * | | | | | | | Handle exceptions when writing to .git/configDouglas Barbosa Alexandre2018-01-031-0/+3
| | | | | | | | |
| * | | | | | | | Import directory tree created with hashed storage using import rake taskDouglas Barbosa Alexandre2018-01-034-49/+129
| | | | | | | | |
| * | | | | | | | Does not write to .git/config when importing bare repositoriesDouglas Barbosa Alexandre2018-01-031-5/+5
| | | | | | | | |
| * | | | | | | | Write project full path to .git/config when migrating legacy storageDouglas Barbosa Alexandre2018-01-032-1/+14
| | | | | | | | |
| * | | | | | | | Update project full path in .git/config when renaming namespaceDouglas Barbosa Alexandre2018-01-033-0/+23
| | | | | | | | |
| * | | | | | | | Update project full path in .git/config when transfering a projectDouglas Barbosa Alexandre2018-01-032-0/+22
| | | | | | | | |
| * | | | | | | | Update project full path in .git/config when renaming a repositoryDouglas Barbosa Alexandre2018-01-033-1/+20
| | | | | | | | |
| * | | | | | | | Write project full path to .git/config when creating projectsDouglas Barbosa Alexandre2018-01-033-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd need to keep track of project full path otherwise directory tree created with hashed storage enabled cannot be usefully imported using the import rake task.
* | | | | | | | | Merge branch '13355-definition-margin' into 'master'Filipa Lacerda2018-01-031-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "reStructuredText rendering of definition lists" Closes #13355 See merge request gitlab-org/gitlab-ce!16202
| * | | | | | | | | Add left margin to definition elements13355-definition-marginAnnabel Dunstone Gray2018-01-031-0/+4
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pre-commit-prettier' into 'master'Robert Speicher2018-01-034-0/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre commit prettier See merge request gitlab-org/gitlab-ce!16061
View Lorry Controller Status