summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-272-6/+18
|\
| * Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-262-2/+10
| * Add `rescue false`.blackst0ne2017-07-262-2/+2
| * Refactor CSRF protectionblackst0ne2017-07-262-32/+6
| * Add CSRF token verification to APIblackst0ne2017-07-261-4/+34
* | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-271-1/+7
|\ \
| * | Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-241-4/+5
| * | Add author_id & assignee_id param to /issues APIToon Claes2017-07-241-0/+5
* | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-c...Casper2017-07-261-1/+1
* | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-12/+44
|\ \ \
| * | | Fix plain LDAP (no encryption)Michael Kozono2017-07-261-3/+6
| * | | Fix code styleMichael Kozono2017-07-261-5/+5
| * | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-5/+1
| * | | Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-261-0/+2
| * | | Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-261-0/+1
| * | | Verify certificates in `omniauth-ldap`Michael Kozono2017-07-261-1/+2
| * | | Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-261-0/+1
| * | | Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-261-5/+15
| * | | Set `Net::LDAP` encryption properlyMichael Kozono2017-07-261-8/+26
| * | | Use encryption instead of methodMichael Kozono2017-07-261-2/+2
* | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'Yorick Peterse2017-07-261-0/+2
|\ \ \ \
| * | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routesMichael Kozono2017-07-251-0/+2
* | | | | Merge branch 'post-upload-pack-opt-out' into 'master'Sean McGivern2017-07-261-1/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Enable gitaly_post_upload_pack by defaultJacob Vosmaer2017-07-251-1/+4
| |/ / /
* | | | Merge branch 'zj-repo-exists-gitaly' into 'master'Sean McGivern2017-07-263-5/+23
|\ \ \ \
| * | | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-263-5/+23
* | | | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-261-6/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-251-6/+0
| | |_|/ | |/| |
* | | | Merge branch '30634-protected-pipeline' into 'master'Kamil TrzciƄski2017-07-254-22/+47
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2020-58/+178
| |\ \ \ \
| * | | | | Use struct instead of hashLin Jen-Shin2017-07-203-5/+5
| * | | | | Use hash to return multiple objectsLin Jen-Shin2017-07-203-8/+8
| * | | | | Fix tests and fine tweak permission error messageLin Jen-Shin2017-07-191-2/+4
| * | | | | Eliminate N+1 queries on checking different protected refsLin Jen-Shin2017-07-191-7/+23
| * | | | | Rename can_push_or_merge_to_branch? to can_update_branch?Lin Jen-Shin2017-07-181-1/+1
| * | | | | Remove old request store wrapLin Jen-Shin2017-07-181-60/+0
| * | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1814-47/+182
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-17120-874/+1550
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-059-47/+217
| |\ \ \ \ \ \ \
| * | | | | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-042-2/+68
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0425-91/+1380
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-041-0/+4
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-29200-1079/+2621
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-075-33/+96
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-063-10/+13
* | | | | | | | | | | | Merge branch 'issue_34622' into 'master'Sean McGivern2017-07-257-157/+282
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add group milestones API endpointissue_34622Felipe Artur2017-07-217-157/+282
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bvl-free-unused-names' into 'master'Dmitriy Zaporozhets2017-07-251-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add contents of `public` as forbidden top-level routesBob Van Landuyt2017-07-251-0/+10
| * | | | | | | | | | | | Remove a bunch of reserved top level routesBob Van Landuyt2017-07-251-10/+0
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |