summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-161-4/+51
* Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-161-1/+10
|\
| * Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627James Edwards-Jones2018-01-161-1/+10
* | Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-161-0/+8
|\ \
| * | Fix links to uploaded files on wiki pagesNick Thomas2018-01-161-0/+8
* | | Merge branch 'print-list-of-available-backups' into 'master'Douwe Maan2018-01-161-0/+6
|\ \ \ | |/ / |/| |
| * | Check for both backup filesprint-list-of-available-backupsBalasankar "Balu" C2018-01-161-1/+1
| * | Imitate other specsBalasankar "Balu" C2018-01-161-1/+1
| * | Try one expectation onlyBalasankar "Balu" C2018-01-161-2/+0
| * | Run the code to be testedBalasankar "Balu" C2018-01-151-0/+1
| * | List available backups for restoreBalasankar "Balu" C2018-01-151-0/+7
* | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-161-12/+27
|\ \ \
| * | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-161-12/+27
* | | | Prevent background migration spec from polluting later modelsSean McGivern2018-01-161-0/+4
* | | | Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-151-0/+158
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-1243-710/+1978
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use `Gitlab::Utils::Override` over defined?(super)Lin Jen-Shin2017-12-261-0/+158
* | | | | Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master'Robert Speicher2018-01-151-20/+36
|\ \ \ \ \
| * | | | | Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-151-20/+36
| | |_|/ / | |/| | |
* | | | | Resolve "Managed Prometheus deployment installs a lot of extra stuff"Mayra Cabrera2018-01-152-4/+25
|/ / / /
* | | | Fixing request json mime typeFrancisco Javier López2018-01-151-0/+10
* | | | Merge branch 'sh-log-when-user-blocked' into 'master'Douwe Maan2018-01-151-0/+53
|\ \ \ \
| * | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-141-0/+53
| | |/ / | |/| |
* | | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-152-31/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-112-31/+56
* | | | Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-121-13/+35
|\ \ \ \
| * | | | Ensure that emails contain absolute, rather than relative, links to user uploadsNick Thomas2018-01-111-13/+35
* | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-116-29/+0
|\ \ \ \ \
| * | | | | Remove soft removals related codeYorick Peterse2018-01-086-29/+0
* | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-111-28/+38
|\ \ \ \ \ \
| * | | | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-111-28/+38
* | | | | | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-111-0/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-091-0/+14
* | | | | | | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-114-0/+62
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-104-0/+62
| |/ / / / /
* | | | | | Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master'Douwe Maan2018-01-102-56/+23
|\ \ \ \ \ \
| * | | | | | Migrate GitlabProject (re)move project endpointsZeger-Jan van de Weg2018-01-092-56/+23
* | | | | | | Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-091-2/+6
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-092-11/+331
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix spec in shell_spec.rbJames Edwards-Jones2018-01-081-1/+1
| * | | | | Backport spec fixes in spec/lib/gitlab/shell_spec.rbValery Sizov2018-01-081-10/+12
| * | | | | Backport authorized_keys_enabled defaults to true'Michael Kozono2018-01-081-0/+212
| * | | | | Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-11/+99
| * | | | | Backport authorized_keys branch 'find-key-by-fingerprint'Pablo Carranza2018-01-081-0/+18
* | | | | | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-091-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add speccheck-environment-regex-ceShinya Maeda2018-01-081-1/+2
* | | | | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into 'm...Stan Hu2018-01-081-2/+18
|\ \ \ \ \ \
| * | | | | | Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-051-2/+18
* | | | | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-082-5/+20
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-052-5/+20
| | |_|/ / / | |/| | | |