summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Verify certificates in `omniauth-ldap`Michael Kozono2017-07-262-1/+32
* Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-262-0/+31
* Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-262-5/+45
* Set `Net::LDAP` encryption properlyMichael Kozono2017-07-262-19/+117
* Use encryption instead of methodMichael Kozono2017-07-262-16/+16
* Add LDAP config optionsMichael Kozono2017-07-262-1/+34
* Upgrade omniauth-ldap gem (and some dependencies)Michael Kozono2017-07-262-9/+9
* Merge branch 'docs/remove-outdated-label-from-contributing-guide' into 'master'Robert Speicher2017-07-251-3/+3
|\
| * Remove outdated ~Frontend label in CONTRIBUTING.mdRémy Coutable2017-07-251-3/+3
* | Merge branch 'fix-conflict-pluralized' into 'master'Clement Ho2017-07-251-1/+1
|\ \ | |/ |/|
| * fix conflict pluralizedEmilien Mottet2017-07-241-1/+1
* | Merge branch '35204-doc-api-ci-lint-typo' into 'master'Rémy Coutable2017-07-252-0/+6
|\ \
| * | Add link to doc/api/ci/lint.mdTakuya Noguchi2017-07-172-0/+6
* | | Merge branch 'upgrade_re2' into 'master'Rémy Coutable2017-07-252-3/+3
|\ \ \
| * | | Upgrade re2 to support seperate CXX and CC passingFrank Groeneveld2017-07-252-3/+3
* | | | Merge branch 'patch-23' into 'master'Drew Blessing2017-07-251-2/+5
|\ \ \ \
| * | | | Add instructions for enabling the `pg_trgm` extension in the production db. A...Chenjerai Katanda2017-07-241-2/+5
* | | | | Merge branch '2971-multiproject-grah-ce-port' into 'master'Phil Hughes2017-07-252-1/+6
|\ \ \ \ \
| * | | | | Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-portFilipa Lacerda2017-07-252-1/+6
* | | | | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-250-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-2538-176/+575
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Extract validationsLin Jen-Shin2017-07-211-24/+24
| * | | | | | Add a note that schedules could be deactivatedLin Jen-Shin2017-07-211-3/+4
| * | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-20302-866/+6952
| |\ \ \ \ \ \
| * | | | | | | Use struct instead of hashLin Jen-Shin2017-07-205-19/+20
| * | | | | | | Make permission checks easier to understandLin Jen-Shin2017-07-201-6/+6
| * | | | | | | Use hash to return multiple objectsLin Jen-Shin2017-07-205-25/+25
| * | | | | | | Fix tests and fine tweak permission error messageLin Jen-Shin2017-07-192-7/+9
| * | | | | | | Eliminate N+1 queries on checking different protected refsLin Jen-Shin2017-07-192-11/+28
| * | | | | | | Add a test for checking queries with different refLin Jen-Shin2017-07-191-6/+27
| * | | | | | | Try to merge permission checks into oneLin Jen-Shin2017-07-191-10/+10
| * | | | | | | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-1814-29/+66
| * | | | | | | Rename :user_cannot_update to :protected_refLin Jen-Shin2017-07-182-4/+4
| * | | | | | | Unify build policy tests and pipeline policy testsLin Jen-Shin2017-07-182-13/+32
| * | | | | | | Rename can_push_or_merge_to_branch? to can_update_branch?Lin Jen-Shin2017-07-184-6/+10
| * | | | | | | Restore some tests from masterLin Jen-Shin2017-07-181-5/+33
| * | | | | | | Remove old request store wrapLin Jen-Shin2017-07-182-167/+0
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1850-231/+533
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-171668-10027/+20733
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Make message and code more clearLin Jen-Shin2017-07-061-2/+5
| * | | | | | | | | Merge allowed_to_create? into CreatePipelineServiceLin Jen-Shin2017-07-056-128/+122
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0595-496/+2706
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't extend from struct as rubocop suggestsLin Jen-Shin2017-07-041-1/+9
| * | | | | | | | | | Add test for RequestStoreWrapLin Jen-Shin2017-07-041-0/+99
| * | | | | | | | | | Make sure that retryable_builds would preload projectLin Jen-Shin2017-07-041-1/+1
| * | | | | | | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-043-3/+69
| * | | | | | | | | | Update tests due to permission changesLin Jen-Shin2017-07-0414-46/+51
| * | | | | | | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-044-19/+21
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-04281-2168/+5780
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-046-42/+93