summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-id-restricted-access-to-private-repo-11-6' into '11-6-...Yorick Peterse2019-02-271-11/+3
|\
| * Forbid creating discussions for users with restricted accessIgor Drozdov2019-02-071-11/+3
* | Merge branch 'security-commit-private-related-mr-11-6' into '11-6-stable'Yorick Peterse2019-02-271-1/+9
|\ \
| * | Don't allow non-members to see private related MRsPatrick Bajao2019-02-151-1/+9
| |/
* | Merge branch 'security-protect-private-repo-information-11-6' into '11-6-stable'Yorick Peterse2019-02-273-18/+23
|\ \
| * | Prevent leaking of private repo data through APILuke Duncalfe2019-02-203-18/+23
| |/
* | Fix conflictMałgorzata Ksionek2019-02-201-9/+6
|/
* Merge branch 'security-pipeline-trigger-tokens-exposure-11-6' into 'security-...Yorick Peterse2019-01-243-6/+38
* Merge branch 'security-11-6-test-permissions' into 'security-11-6'Yorick Peterse2019-01-241-3/+3
* Merge branch 'fj-55781-fix-api-blob-content-disposition' into 'master'Sean McGivern2019-01-021-1/+7
* Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-274-20/+40
|\
| * Merge branch 'security-11-6-guests-jobs-api' into 'security-11-6'John Jarvis2018-12-271-0/+5
| |\
| | * Move pipeline auth above pipeline assignmentMatija Čupić2018-12-221-1/+1
| | * Authorize read_pipeline before read_buildMatija Čupić2018-12-221-0/+1
| | * Authorize read_build when listing pipeline jobsMatija Čupić2018-12-221-0/+2
| | * Authorize read_build action when listing jobsMatija Čupić2018-12-221-0/+2
| * | Merge branch 'ensure-that-build-token-is-always-running' into 'security-11-6'John Jarvis2018-12-273-20/+35
| |\ \ | | |/ | |/|
| | * Ensure that build token is only used when runningKamil Trzciński2018-12-183-20/+35
* | | Merge branch '54626-able-to-download-a-single-archive-file-with-api-by-ref-na...Grzegorz Bizon2018-12-171-0/+24
* | | Merge branch 'osw-suggest-diff-line-change' into 'master'Phil Hughes2018-12-143-0/+44
* | | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-072-5/+5
|\ \ \
| * | | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-062-5/+5
* | | | Backports some changes from gitlab-ee!7885Rubén Dávila2018-12-071-1/+16
| |/ / |/| |
* | | Merge branch '54857-fix-templates-path-traversal' into 'master'Cindy Pallares2018-12-061-1/+1
|\ \ \
| * | | Prevent a path traversal attack on global file templatesNick Thomas2018-12-051-1/+1
* | | | Merge branch 'blob-count2' into 'master'Rémy Coutable2018-12-061-6/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Optimized file search to work without limitsJan Provaznik2018-12-061-6/+1
* | | | Rename project's pipelines relationFrancisco Javier López2018-12-053-4/+4
* | | | Merge branch '54826-use-read_repository-scope-on-read-only-files-endpoints' i...Grzegorz Bizon2018-12-051-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Use read_repository scope on read-only files APIJames Lopez2018-12-041-0/+4
| |/ /
* | | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r...Grzegorz Bizon2018-12-0450-61/+67
|\ \ \ | |/ /
| * | Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'Nick Thomas2018-11-3049-61/+61
| |\ \
| | * | Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routingImre Farkas2018-11-2849-61/+61
| | |/
| * | Merge branch 'if-40385-prohibit_impersonation' into 'master'Rémy Coutable2018-11-291-0/+6
| |\ \
| | * | Add config to disable impersonationImre Farkas2018-11-291-0/+6
* | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-292-1/+38
|\ \ \ \ | |/ / /
| * | | Merge branch '33705-merge-request-rebase-api' into 'master'Sean McGivern2018-11-292-1/+38
| |\ \ \ | | |/ / | |/| |
| | * | Allow the status of a rebase to be determinedNick Thomas2018-11-282-1/+12
| | * | Add a rebase API endpoint for merge requestsNick Thomas2018-11-271-0/+26
| | |/
* | | Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-285-4/+28
|\ \ \ | |/ /
| * | Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'Douwe Maan2018-11-281-2/+7
| |\ \
| | * | Removes all the irrelevant import related code and columnsTiago Botelho2018-11-271-2/+7
| | |/
| * | Merge branch 'lock-trace-writes' into 'master'Stan Hu2018-11-271-0/+4
| |\ \ | | |/ | |/|
| | * Lock writes to trace streamKamil Trzciński2018-11-271-0/+4
| * | Set content disposition attachment to several endpointsFrancisco Javier López2018-11-232-0/+2
| |/
| * Merge branch 'optimise-job-request' into 'master'Grzegorz Bizon2018-11-211-1/+2
| |\
| | * Use cached size when passing artifacts to Runneroptimise-job-requestKamil Trzciński2018-11-201-1/+2
| * | Change param name for consistencyHeinrich Lee Yu2018-11-191-2/+2
| * | Add group projects API options for including shared and subgroupsHeinrich Lee Yu2018-11-191-1/+13
| |/
* | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokensGrzegorz Bizon2018-11-214-4/+23
|\ \ | |/
View Lorry Controller Status