summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2512-61/+91
|\
| * Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-242-6/+6
| * Merge branch 'backport-gitlab-database' into 'master'Rémy Coutable2018-07-241-0/+26
| |\
| | * Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-241-0/+26
| * | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-242-4/+8
| |\ \
| | * | Remove timeouts for long running requestsZeger-Jan van de Weg2018-07-242-4/+8
| | |/
| * | Make repository cleanup mandatoryZeger-Jan van de Weg2018-07-241-4/+2
| |/
| * Annotate Gitlab::Git::Repository#fetch_refJacob Vosmaer (GitLab)2018-07-242-0/+5
| * Merge branch 'gitaly-add-remote-mandatory' into 'master'Sean McGivern2018-07-231-8/+0
| |\
| | * Remove unused rugged code that is currently on GitalyAlejandro Rodríguez2018-07-201-8/+0
| * | Fix gitlab import project loadFrancisco Javier López2018-07-231-13/+17
| * | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-234-26/+27
| |\ \
| | * | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-204-26/+27
* | | | Remove merge request deletion codeStan Hu2018-07-201-2/+0
* | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-201-0/+22
|\ \ \ \ | |/ / /
| * | | Bring JsonLogger to CEStan Hu2018-07-201-0/+22
| | |/ | |/|
* | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-205-98/+22
|\ \ \ | |/ /
| * | Fixing bug with wiki ref in ProjectSearchResultsFrancisco Javier López2018-07-201-7/+12
| * | Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master'Kamil Trzciński2018-07-202-3/+4
| |\ \ | | |/ | |/|
| | * Fix passing a hash with string keys when fabricating a variableGrzegorz Bizon2018-07-191-1/+1
| | * Fix deserializing yaml variables in imported projectsGrzegorz Bizon2018-07-191-2/+3
| * | Merge branch 'zj-gitaly-migrate-old-migrations' into 'master'Sean McGivern2018-07-201-1/+0
| |\ \
| | * | MigrateProcessCommitWorkerJobs to use GitalyZeger-Jan van de Weg2018-07-191-1/+0
| * | | Migrate add_remote, remove_remote, fetch_internal_remote to gitalyAlejandro Rodríguez2018-07-192-87/+6
* | | | Disable recovery of missing SHAs by defaultStan Hu2018-07-201-2/+9
* | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-196-43/+57
|\ \ \ \ | |/ / /
| * | | Add missing Gitaly branch_update nil checksJacob Vosmaer (GitLab)2018-07-192-5/+8
| * | | Merge branch 'add-total-time-flat-printer-for-profiling' into 'master'Rémy Coutable2018-07-192-0/+45
| |\ \ \
| | * | | Add a Gitlab::Profiler.print_by_total_time convenience methodSean McGivern2018-07-192-0/+45
| | |/ /
| * | | Merge branch 'sh-normalize-urls' into 'master'Grzegorz Bizon2018-07-191-6/+9
| |\ \ \ | | |/ / | |/| |
| | * | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-191-6/+9
| * | | Merge branch 'use-rugged-for-reference-validator' into 'master'Douwe Maan2018-07-191-4/+4
| |\ \ \
| | * | | Use rugged to validate ref nameAhmad Hassan2018-07-191-4/+4
| * | | | Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-191-34/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-181-34/+0
* | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-192-41/+29
|\ \ \ \ \ | |/ / / /
| * | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-182-41/+29
| | |_|/ | |/| |
* | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-191-6/+4
* | | | Fix and clean up code for deleting branchesStan Hu2018-07-181-20/+27
* | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-187-204/+63
|\ \ \ \ | |/ / /
| * | | Client implementation for Repository#new_commitsZeger-Jan van de Weg2018-07-183-50/+34
| |/ /
| * | Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' into...Douwe Maan2018-07-181-1/+24
| |\ \
| | * | Improves remote message when a developer is unable to push in an empty reposi...27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-181-1/+24
| * | | Remove unreachable Git codeJacob Vosmaer (GitLab)2018-07-183-152/+3
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-...jivl-dev-master-into-com-masterJose2018-07-171-1/+2
| |\ \ \
| | * \ \ Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-171-1/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | | * | Fix symlink vulnerability in project importStan Hu2018-07-171-1/+2
* | | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-181-4/+9
* | | | | Improve formatting of diff notes that could not be importedStan Hu2018-07-171-1/+1