summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-fj-import-export-assignment-10-6' into 'security-10-6'Mayra Cabrera2018-05-256-9/+42
* Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-04-091-0/+1
* Merge branch 'dm-refs-contains-sha-encoding' into 'master'Sean McGivern2018-04-091-1/+2
* Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'securit...Douwe Maan2018-04-035-2/+71
* Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-031-2/+5
* Merge branch 'fix/ldap_wihtout_user' into 'master'cherry-pick-ab8f13c3Douwe Maan2018-03-294-18/+13
* 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-193-10/+58
|\
| * Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-163-10/+58
| * 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-163-2/+147
|/
* Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-131-2/+2
* 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-0817-60/+64
|\
| * 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-078-28/+21
| |\ \
| | * \ Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-072-2/+9
| | |\ \
| | | * | Limit queries to a user-branch combinationBob Van Landuyt2018-03-072-4/+7
| | | * | 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-074-4/+4
| | |\ \ \ \
| | | * | | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-074-4/+4
| | | | |/ / | | | |/| |
| | * | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-071-18/+4
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | naming thingsKim "BKC" Carlbäcker2018-03-071-2/+2
| | | * | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-061-18/+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
| * | | 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
| * | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-073-9/+10
| |\ \ \