summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)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
| | | | | | | | | | | | | | | | Without this parameter, every load of a Wiki page will load all the Wiki pages in the repository for the sidebar. This is a significant performance penalty that can significant slow the display of all Wiki pages. Relates to #40101
| * Merge branch 'backport-gitlab-database' into 'master'Rémy Coutable2018-07-241-0/+26
| |\ | | | | | | | | | | | | Backport various EE changes to Gitlab::Database See merge request gitlab-org/gitlab-ce!20809
| | * Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-241-0/+26
| | | | | | | | | | | | | | | | | | These changes are useful for CE as well. For example, the MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20720 can make use of some of the backported methods.
| * | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-242-4/+8
| |\ \ | | | | | | | | | | | | | | | | Remove timeouts for long running requests See merge request gitlab-org/gitlab-ce!20810
| | * | 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 Gitaly See merge request gitlab-org/gitlab-ce!20754
| | * 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Disable SAML and Bitbucket if OmniAuth is disabled" Closes #48932 See merge request gitlab-org/gitlab-ce!20608
| | * | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-204-26/+27
| | | | | | | | | | | | | | | | | | | | We also try to unify the way we setup OmniAuth, and how we check if it's enabled or not.
* | | | 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
| | |/ | |/| | | | | | | | | | This backports a module that was in EE for Geo so that other modules can have structured logging support.
* | | 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 deserializing YAML variables when a build has been imported Closes #49406 See merge request gitlab-org/gitlab-ce!20713
| | * 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Gitaly migrate old DB migrations Closes gitaly#1106 See merge request gitlab-org/gitlab-ce!20708
| | * | MigrateProcessCommitWorkerJobs to use GitalyZeger-Jan van de Weg2018-07-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This old migration used Rugged to find a commit, while Gitaly is the prefered way now. By migrating this to Gitaly, Gitaly is now a required running component for this migration. Part of https://gitlab.com/gitlab-org/gitaly/issues/1106
| * | | 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 method See merge request gitlab-org/gitlab-ce!20715
| | * | | Add a Gitlab::Profiler.print_by_total_time convenience methodSean McGivern2018-07-192-0/+45
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This method uses Gitlab::Profiler::TotalTimeFlatPrinter internally, which is the same as RubyProf::FlatPrinter, but the min_percent option (and new max_percent option) applies to the _total_ time, not the _self_ time. This helps us figure out if we're calling a library inefficiently, for instance.
| * | | Merge branch 'sh-normalize-urls' into 'master'Grzegorz Bizon2018-07-191-6/+9
| |\ \ \ | | |/ / | |/| | | | | | | | | | Escape username and password in UrlSanitizer#full_url See merge request gitlab-org/gitlab-ce!20684
| | * | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-191-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user uses a password with certain characters (e.g. /, #, +, etc.) UrlSanitizer#full_url will generate an invalid URL that cannot be parsed properly by Addressable::URI. If used with UrlBlocker, this will be flagged as an invalid URI.
| * | | Merge branch 'use-rugged-for-reference-validator' into 'master'Douwe Maan2018-07-191-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use rugged to validate ref name Closes #49043 See merge request gitlab-org/gitlab-ce!20669
| | * | | 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 workers Closes #43312 See merge request gitlab-org/gitlab-ce!20597
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user uses a password with certain characters (e.g. /, #, +, etc.) UrlSanitizer#full_url will generate an invalid URL that cannot be parsed properly by Addressable::URI. If used with UrlBlocker, this will be flagged as an invalid URI.
* | | | 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
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After trying to remove the whole method in 8f69014af2902d8d53fe931268bec60f6858f160, this is a more gentle approach to the method. :) Prior to this change, new commit detection wasn't implemented in Gitaly, this was done through: https://gitlab.com/gitlab-org/gitaly/merge_requests/779 As the new implemented got moved around a bit, the whole RevList class got removed. Part of https://gitlab.com/gitlab-org/gitaly/issues/1233
| * | Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' ↵Douwe Maan2018-07-181-1/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Improve feedback when a developer cannot push in an empty repository Closes #27456 See merge request gitlab-org/gitlab-ce!20519
| | * | Improves remote message when a developer is unable to push in an empty ↵27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-181-1/+24
| | | | | | | | | | | | | | | | repository
| * | | Remove unreachable Git codeJacob Vosmaer (GitLab)2018-07-183-152/+3
| | | |
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jivl-dev-master-into-com-masterJose2018-07-171-1/+2
| |\ \ \ | | | | | | | | | | | | | | | jivl-dev-master-into-com-master
| | * \ \ Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-171-1/+2
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Fix symlink vulnerability in project import See merge request gitlab/gitlabhq!2440
| | | * | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | | | |
| | | * | Fix symlink vulnerability in project importStan Hu2018-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
* | | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-181-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user uses a password with certain characters (e.g. /, #, +, etc.) UrlSanitizer#full_url will generate an invalid URL that cannot be parsed properly by Addressable::URI. If used with UrlBlocker, this will be flagged as an invalid URI.
* | | | | Improve formatting of diff notes that could not be importedStan Hu2018-07-171-1/+1
| | | | |