Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '33601-add-csrf-token-verification-to-api' into 'master' | Sean McGivern | 2017-07-27 | 2 | -6/+18 |
|\ | |||||
| * | Rescue only from ActionController::InvalidAuthenticityToken | Douwe Maan | 2017-07-26 | 2 | -2/+10 |
| * | Add `rescue false`. | blackst0ne | 2017-07-26 | 2 | -2/+2 |
| * | Refactor CSRF protection | blackst0ne | 2017-07-26 | 2 | -32/+6 |
| * | Add CSRF token verification to API | blackst0ne | 2017-07-26 | 1 | -4/+34 |
* | | Merge branch 'tc-issue-api-assignee' into 'master' | Sean McGivern | 2017-07-27 | 1 | -1/+7 |
|\ \ | |||||
| * | | Allow query param scope for /issues API endpointtc-issue-api-assignee | Toon Claes | 2017-07-24 | 1 | -4/+5 |
| * | | Add author_id & assignee_id param to /issues API | Toon Claes | 2017-07-24 | 1 | -0/+5 |
* | | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-c... | Casper | 2017-07-26 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'dev/master' | Douwe Maan | 2017-07-26 | 1 | -12/+44 |
|\ \ \ | |||||
| * | | | Fix plain LDAP (no encryption) | Michael Kozono | 2017-07-26 | 1 | -3/+6 |
| * | | | Fix code style | Michael Kozono | 2017-07-26 | 1 | -5/+5 |
| * | | | Move backwards compatibility logic out of the code | Michael Kozono | 2017-07-26 | 1 | -5/+1 |
| * | | | Pass configured `ssl_version` to `omniauth-ldap` | Michael Kozono | 2017-07-26 | 1 | -0/+2 |
| * | | | Pass configured `ca_file` to `omniauth-ldap` | Michael Kozono | 2017-07-26 | 1 | -0/+1 |
| * | | | Verify certificates in `omniauth-ldap` | Michael Kozono | 2017-07-26 | 1 | -1/+2 |
| * | | | Set `Net::LDAP` `ssl_version` option | Michael Kozono | 2017-07-26 | 1 | -0/+1 |
| * | | | Set `Net::LDAP` `ca_file` option | Michael Kozono | 2017-07-26 | 1 | -5/+15 |
| * | | | Set `Net::LDAP` encryption properly | Michael Kozono | 2017-07-26 | 1 | -8/+26 |
| * | | | Use encryption instead of method | Michael Kozono | 2017-07-26 | 1 | -2/+2 |
* | | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master' | Yorick Peterse | 2017-07-26 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routes | Michael Kozono | 2017-07-25 | 1 | -0/+2 |
* | | | | | Merge branch 'post-upload-pack-opt-out' into 'master' | Sean McGivern | 2017-07-26 | 1 | -1/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Enable gitaly_post_upload_pack by default | Jacob Vosmaer | 2017-07-25 | 1 | -1/+4 |
| |/ / / | |||||
* | | | | Merge branch 'zj-repo-exists-gitaly' into 'master' | Sean McGivern | 2017-07-26 | 3 | -5/+23 |
|\ \ \ \ | |||||
| * | | | | Implement GRPC call to RepositoryService | Z.J. van de Weg | 2017-07-26 | 3 | -5/+23 |
* | | | | | Merge branch '31129-jira-project-key-elim' into 'master' | Sean McGivern | 2017-07-26 | 1 | -6/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Remove project_key from the Jira configuration | Jarka Kadlecova | 2017-07-25 | 1 | -6/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '30634-protected-pipeline' into 'master' | Kamil TrzciĆski | 2017-07-25 | 4 | -22/+47 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-20 | 20 | -58/+178 |
| |\ \ \ \ | |||||
| * | | | | | Use struct instead of hash | Lin Jen-Shin | 2017-07-20 | 3 | -5/+5 |
| * | | | | | Use hash to return multiple objects | Lin Jen-Shin | 2017-07-20 | 3 | -8/+8 |
| * | | | | | Fix tests and fine tweak permission error message | Lin Jen-Shin | 2017-07-19 | 1 | -2/+4 |
| * | | | | | Eliminate N+1 queries on checking different protected refs | Lin Jen-Shin | 2017-07-19 | 1 | -7/+23 |
| * | | | | | Rename can_push_or_merge_to_branch? to can_update_branch? | Lin Jen-Shin | 2017-07-18 | 1 | -1/+1 |
| * | | | | | Remove old request store wrap | Lin Jen-Shin | 2017-07-18 | 1 | -60/+0 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-18 | 14 | -47/+182 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-17 | 120 | -874/+1550 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-05 | 9 | -47/+217 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Introduce Gitlab::Cache::RequestStoreWrap | Lin Jen-Shin | 2017-07-04 | 2 | -2/+68 |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-04 | 25 | -91/+1380 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Consistently check permission for creating pipelines, | Lin Jen-Shin | 2017-07-04 | 1 | -0/+4 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-06-29 | 200 | -1079/+2621 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-06-07 | 5 | -33/+96 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Try to report why it's failing and fix tests | Lin Jen-Shin | 2017-06-06 | 3 | -10/+13 |
* | | | | | | | | | | | | Merge branch 'issue_34622' into 'master' | Sean McGivern | 2017-07-25 | 7 | -157/+282 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add group milestones API endpointissue_34622 | Felipe Artur | 2017-07-21 | 7 | -157/+282 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'bvl-free-unused-names' into 'master' | Dmitriy Zaporozhets | 2017-07-25 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add contents of `public` as forbidden top-level routes | Bob Van Landuyt | 2017-07-25 | 1 | -0/+10 |
| * | | | | | | | | | | | | Remove a bunch of reserved top level routes | Bob Van Landuyt | 2017-07-25 | 1 | -10/+0 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |