summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-234-10/+18
* Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-231-1/+1
* Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-192-1/+6
* Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-191-0/+4
* Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7James Lopez2018-03-195-20/+75
|\
| * Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-165-20/+75
| * Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-161-0/+13
* | Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-161-0/+13
* | Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'Sean McGivern2018-03-161-8/+10
* | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-161-5/+11
* | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-164-32/+147
|/
* Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-131-2/+2
* Merge branch 'tc-api-fix-expose_url' into 'master'Stan Hu2018-03-131-1/+1
* Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-131-1/+5
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 10-6-stable-frozenJames Lopez2018-03-0834-170/+529
|\
| * Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-0/+1
| |\
| | * Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+1
| * | Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-pushBob Van Landuyt2018-03-081-6/+3
| * | Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-0712-36/+24
| |\ \
| | * \ Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-074-2/+11
| | |\ \
| | | * | Limit queries to a user-branch combinationBob Van Landuyt2018-03-072-4/+7
| | | * | Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-071-1/+1
| | | * | Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-072-0/+2
| | | * | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-1/+1
| | | * | Allow maintainers to push to a single branchBob Van Landuyt2018-03-071-1/+5
| | * | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-071-4/+4
| | |\ \ \
| | | * | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-061-4/+4
| | * | | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-075-5/+5
| | |\ \ \ \
| | | * | | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-075-5/+5
| | * | | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-072-25/+4
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | naming thingsKim "BKC" Carlbäcker2018-03-071-2/+2
| | | * | | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-062-25/+4
| | | | |/ / | | | |/| |
| * | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-071-4/+5
| |/ / / /
| * | | | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-072-9/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Move OperationService#UserRemoveBranchZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move OperationService#UserCreateBranchZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move CommitService#Languages to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move RefService#CreateBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move RefService#DeleteBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move OperationService#UserRevert to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move OperationService#UserAddTag to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move CommitService::CommitPatch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | * | | Move Repository#HasLocalBranches to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-075-66/+307
| |\ \ \ \
| | * | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-075-66/+307
| * | | | | Merge branch 'replace_redcarpet_with_cmark' into 'master'Sean McGivern2018-03-078-35/+153
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-078-35/+153
| * | | | | Count discussions on issues and merge requests as contributions for the contr...Riccardo Padovani2018-03-071-1/+1
| * | | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-071-6/+9
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | CI charts now include the current dayDakkaron2018-03-061-6/+9
View Lorry Controller Status