summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_countRémy Coutable2018-01-231-0/+4
* Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-231-0/+14
|\
| * Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-221-0/+14
* | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-231-0/+3
|\ \
| * | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-191-0/+3
| |/
* | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-221-0/+156
|\ \
| * | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-191-0/+156
* | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-0/+12
| |/ |/|
* | Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-181-1/+1
|\ \
| * | Reduce UPDATEs for background column type changesbackground-migration-fixYorick Peterse2018-01-181-1/+1
* | | Merge branch 'gitaly-commit-signature' into 'master'Sean McGivern2018-01-183-14/+92
|\ \ \
| * | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-183-14/+92
| |/ /
* | | Remove Rugged::Walker from Repository#logJacob Vosmaer (GitLab)2018-01-181-38/+0
|/ /
* | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-176-29/+181
|\ \ | |/ |/|
| * Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-171-2/+2
| * Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-161-13/+44
| * Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-161-0/+16
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-162-12/+8
| * Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-161-0/+62
| * Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-161-4/+51
* | Remove unused methods from Gitlab::GitJacob Vosmaer (GitLab)2018-01-171-8/+0
* | Merge branch 'fix/gb/improve-manual-action-tooltips' into 'master'Grzegorz Bizon2018-01-171-4/+4
|\ \ | |/ |/|
| * Fix running manual action tooltipGrzegorz Bizon2018-01-161-4/+4
* | 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 '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-1240-695/+1917
| |\ \ \ | | | |/ | | |/|
| * | | 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 '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
| |/ / / / |/| | | |