summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Do not run ee_compat_check on security branches41396-ee_compat_check-and-security-fix-developmentAlessio Caiazza2018-01-041-0/+1
* Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-043-10/+25
|\
| * Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-033-10/+25
* | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-042-0/+15
|\ \
| * | Better Englishgitaly-merge-nilJacob Vosmaer2018-01-031-1/+1
| * | Fix method lookupJacob Vosmaer2018-01-031-1/+3
| * | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-032-0/+15
* | | Merge branch 'integration-tests' into 'master'Rémy Coutable2018-01-041-1/+1
|\ \ \
| * | | Include integration tests in CE/EE testing documentationJoshua Lambert2018-01-041-1/+1
* | | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-043-3/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-276-7/+17
* | | | Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-048-12/+402
|\ \ \ \
| * | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-038-12/+402
* | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-0442-98/+805
|\ \ \ \ \
| * | | | | 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 closed/me...Oswaldo Ferreira2018-01-023-2/+9
| * | | | | 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 'ma...Kamil Trzciński2018-01-0418-14/+244
|\ \ \ \ \ \
| * | | | | | 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"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 readuse-heredoc-for-keysLin Jen-Shin2018-01-032-34/+43
* | | | | | | Merge branch 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-...Grzegorz Bizon2018-01-043-5/+32
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge branch '37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-an...Kamil Trzciński2018-01-033-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | fix issue #37843Danny2018-01-033-1/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-032-0/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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' int...Kamil Trzciński 🎆 Back on Jan 2!2018-01-033-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 'ma...Robert Speicher2018-01-0318-61/+259
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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