summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | 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
|\ \ \ \ \
| * | | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-063-9/+10
* | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-061-0/+8
* | | | | | Merge branch 'banzai-n-plus-one' into 'master'Douwe Maan2018-03-061-1/+2
|\ \ \ \ \ \
| * | | | | | Add Gitaly N+1 notice for Banzai filteringAlejandro Rodríguez2018-03-051-1/+2
* | | | | | | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-061-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Set sha256 checksum when archiving tracesShinya Maeda2018-03-071-1/+2
* | | | | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-062-0/+118
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0649-269/+930
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Address review commentsFelipe Artur2018-03-051-1/+1
| * | | | | | | | | Bring one group board to CEFelipe Artur2018-03-032-0/+118
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'prepend-grape-api-ce' into 'master'Rémy Coutable2018-03-061-21/+40
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-068-16/+53
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-06127-2302/+3820
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |