summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-041-0/+18
* Added multi editor setting on the profile preferences pageJose Ivan Vargas2018-01-043-1/+19
* Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets2018-01-041-0/+17
|\
| * User#projects_limit remove DB default and added NOT NULL constraintMario de la Ossa2017-12-301-0/+17
* | Merge branch 'conditionally-eager-load-event-target-authors' into 'master'Douwe Maan2018-01-042-0/+23
|\ \
| * | Eager load event target authors whenever possibleconditionally-eager-load-event-target-authorsYorick Peterse2018-01-042-0/+23
* | | Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m...Douwe Maan2018-01-041-0/+25
|\ \ \
| * | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-0/+25
* | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable2018-01-041-13/+34
|\ \ \ \
| * | | | Just use the tests from EE3377-use-artifacts-tests-from-eeLin Jen-Shin2017-12-261-13/+34
* | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-042-58/+107
|\ \ \ \ \
| * | | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-28/+69
| * | | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-30/+38
* | | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-042-28/+7
|\ \ \ \ \ \
| * | | | | | Make DeleteConflictingRedirectRoutes no-opmk-no-op-delete-conflicting-redirectsMichael Kozono2018-01-032-28/+7
* | | | | | | Merge branch '40533-groups-tree-updates' into 'master'Filipa Lacerda2018-01-046-63/+121
|\ \ \ \ \ \ \
| * | | | | | | Update test to remove carent icon checkKushal Pandya2018-01-021-8/+0
| * | | | | | | Update selector to test SVG icon nameKushal Pandya2017-12-281-7/+3
| * | | | | | | Update selector to test SVG icon name, cleanup testsKushal Pandya2017-12-262-45/+18
| * | | | | | | Update icon names, add `updated_at` prop to mock objectsKushal Pandya2017-12-261-3/+19
| * | | | | | | ItemStatsValue ComponentKushal Pandya2017-12-261-0/+81
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-041-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-2/+12
* | | | | | | | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-041-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Better Englishgitaly-merge-nilJacob Vosmaer2018-01-031-1/+1
| * | | | | | | | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-031-0/+14
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-041-3/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-271-3/+11
* | | | | | | | | Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-041-1/+90
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-031-1/+90
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-0422-43/+423
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes spec failures due to not returning metrics for MRs other than closed/me...Oswaldo Ferreira2018-01-022-2/+5
| * | | | | | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-0222-43/+420
* | | | | | | | | | Merge branch '41054-disable-creation-of-new-kubernetes-integrations' into 'ma...Kamil Trzciński2018-01-048-4/+174
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-048-4/+174
* | | | | | | | | | | Resolve "Resizable file list and commit panel"Tim Zallmann2018-01-041-0/+59
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'use-heredoc-for-keys' into 'master'Grzegorz Bizon2018-01-041-27/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use heredoc for long strings so it's easier to readuse-heredoc-for-keysLin Jen-Shin2018-01-031-27/+36
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-...Grzegorz Bizon2018-01-041-4/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | 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-031-4/+26
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | fix issue #37843Danny2018-01-031-0/+4
* | | | | | | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into 'ma...Robert Speicher2018-01-039-49/+192
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | 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 Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-031-2/+8
| * | | | | | | | Add spec for Project#write_repository_configDouglas Barbosa Alexandre2018-01-031-0/+22
| * | | | | | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-031-11/+11
| * | | | | | | | Fix TestEnv.copy_repo to use disk_path instead of full_pathDouglas Barbosa Alexandre2018-01-033-3/+3
| * | | | | | | | Import directory tree created with hashed storage using import rake taskDouglas Barbosa Alexandre2018-01-032-37/+96