summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-241-0/+26
* 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
* | | Bring JsonLogger to CEStan Hu2018-07-201-0/+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
* | | 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
* | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-182-41/+29
| |_|/ |/| |
* | | 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
* | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-177-18/+130
|\ \ \ \ | |/ / / |/| | |
| * | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-171-7/+3
| * | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| * | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-0662-1346/+1060
| |\ \ \
| * | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-063-11/+49
| * | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-206-20/+93
| * | | | Fix MR hook builderSean McGivern2018-06-201-1/+1
| * | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-202-0/+2
* | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-171-69/+6
* | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-174-0/+74
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-161-0/+31
| * | | | Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-163-0/+43
* | | | | Merge branch 'tweak-sql-buckets' into 'master'Yorick Peterse2018-07-161-1/+1
|\ \ \ \ \
| * | | | | Add a 10 ms bucket for SQL timingstweak-sql-bucketsYorick Peterse2018-07-101-1/+1
* | | | | | Remove Repository#lookup and unreachable rugged codeJacob Vosmaer (GitLab)2018-07-161-179/+0
* | | | | | Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-o...Sean McGivern2018-07-164-18/+130
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactor code based on feedbackJames Lopez2018-07-162-5/+5