summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-24/+0
* Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-261-0/+31
* Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-261-0/+33
* Verify certificates in `omniauth-ldap`Michael Kozono2017-07-261-0/+30
* Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-261-0/+30
* Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-261-0/+30
* Set `Net::LDAP` encryption properlyMichael Kozono2017-07-261-11/+91
* Use encryption instead of methodMichael Kozono2017-07-261-14/+14
* Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-2524-109/+432
|\
| * Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2073-122/+1517
| |\
| * | Use struct instead of hashLin Jen-Shin2017-07-201-12/+12
| * | Use hash to return multiple objectsLin Jen-Shin2017-07-201-13/+13
| * | Add a test for checking queries with different refLin Jen-Shin2017-07-191-6/+27
| * | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-1814-29/+66
| * | Unify build policy tests and pipeline policy testsLin Jen-Shin2017-07-182-13/+32
| * | Restore some tests from masterLin Jen-Shin2017-07-181-5/+33
| * | Remove old request store wrapLin Jen-Shin2017-07-181-107/+0
| * | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1813-77/+212
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-17599-3005/+8072
| |\ \ \
| * | | | Merge allowed_to_create? into CreatePipelineServiceLin Jen-Shin2017-07-052-97/+100
| * | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0527-237/+629
| |\ \ \ \
| * | | | | Don't extend from struct as rubocop suggestsLin Jen-Shin2017-07-041-1/+9
| * | | | | Add test for RequestStoreWrapLin Jen-Shin2017-07-041-0/+99
| * | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-041-1/+1
| * | | | | Update tests due to permission changesLin Jen-Shin2017-07-0414-46/+51
| * | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-042-8/+8
| * | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0467-561/+1348
| |\ \ \ \ \
| * | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-042-35/+64
| * | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-292-0/+137
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-29988-8610/+23954
| |\ \ \ \ \ \ \
| * | | | | | | | Fix other tests which tested against error message30634-protected-pipelineLin Jen-Shin2017-06-072-2/+4
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-0715-230/+302
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Still allow legacy triggers, feedback:Lin Jen-Shin2017-06-061-3/+3
| * | | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-063-8/+19
| * | | | | | | | | Disallow legacy trigger without a ownerLin Jen-Shin2017-06-061-0/+13
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-0628-427/+930
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't check permission, only protected ref if no userLin Jen-Shin2017-06-061-2/+55
| * | | | | | | | | | Move the check to Pipeline.allowed_to_create?Lin Jen-Shin2017-06-061-0/+97
| * | | | | | | | | | Forbid creating pipeline if it's protected andLin Jen-Shin2017-06-051-1/+46
* | | | | | | | | | | Merge branch 'bvl-fix-api-in-path-regex' into 'master'Dmitriy Zaporozhets2017-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add `api` prefix as a top level route in the spec.bvl-fix-api-in-path-regexBob Van Landuyt2017-07-251-1/+1
* | | | | | | | | | | | Merge branch '35474-fix-new-issue' into 'master'Phil Hughes2017-07-251-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move relative_path to the element that is being clickedJarka Kadlecova2017-07-251-0/+18
* | | | | | | | | | | | | Merge branch 'issue_34622' into 'master'Sean McGivern2017-07-253-96/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add group milestones API endpointissue_34622Felipe Artur2017-07-213-96/+140
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bvl-free-unused-names' into 'master'Dmitriy Zaporozhets2017-07-251-10/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Take ee words into accountBob Van Landuyt2017-07-251-15/+24
| * | | | | | | | | | | | Adjust `PathRegex` to validate files in the `public` directoryBob Van Landuyt2017-07-251-7/+39
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master'Kamil Trzciński2017-07-251-20/+69
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-projectGrzegorz Bizon2017-07-211-2/+2