Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Verify certificates in `omniauth-ldap` | Michael Kozono | 2017-07-26 | 2 | -1/+32 |
* | Set `Net::LDAP` `ssl_version` option | Michael Kozono | 2017-07-26 | 2 | -0/+31 |
* | Set `Net::LDAP` `ca_file` option | Michael Kozono | 2017-07-26 | 2 | -5/+45 |
* | Set `Net::LDAP` encryption properly | Michael Kozono | 2017-07-26 | 2 | -19/+117 |
* | Use encryption instead of method | Michael Kozono | 2017-07-26 | 2 | -16/+16 |
* | Add LDAP config options | Michael Kozono | 2017-07-26 | 2 | -1/+34 |
* | Upgrade omniauth-ldap gem (and some dependencies) | Michael Kozono | 2017-07-26 | 2 | -9/+9 |
* | Merge branch 'docs/remove-outdated-label-from-contributing-guide' into 'master' | Robert Speicher | 2017-07-25 | 1 | -3/+3 |
|\ | |||||
| * | Remove outdated ~Frontend label in CONTRIBUTING.md | Rémy Coutable | 2017-07-25 | 1 | -3/+3 |
* | | Merge branch 'fix-conflict-pluralized' into 'master' | Clement Ho | 2017-07-25 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | fix conflict pluralized | Emilien Mottet | 2017-07-24 | 1 | -1/+1 |
* | | Merge branch '35204-doc-api-ci-lint-typo' into 'master' | Rémy Coutable | 2017-07-25 | 2 | -0/+6 |
|\ \ | |||||
| * | | Add link to doc/api/ci/lint.md | Takuya Noguchi | 2017-07-17 | 2 | -0/+6 |
* | | | Merge branch 'upgrade_re2' into 'master' | Rémy Coutable | 2017-07-25 | 2 | -3/+3 |
|\ \ \ | |||||
| * | | | Upgrade re2 to support seperate CXX and CC passing | Frank Groeneveld | 2017-07-25 | 2 | -3/+3 |
* | | | | Merge branch 'patch-23' into 'master' | Drew Blessing | 2017-07-25 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | Add instructions for enabling the `pg_trgm` extension in the production db. A... | Chenjerai Katanda | 2017-07-24 | 1 | -2/+5 |
* | | | | | Merge branch '2971-multiproject-grah-ce-port' into 'master' | Phil Hughes | 2017-07-25 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-port | Filipa Lacerda | 2017-07-25 | 2 | -1/+6 |
* | | | | | | Merge branch '30634-protected-pipeline' into 'master' | Kamil Trzciński | 2017-07-25 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
* \ \ \ \ \ \ | Merge branch '30634-protected-pipeline' into 'master' | Kamil Trzciński | 2017-07-25 | 38 | -176/+575 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Extract validations | Lin Jen-Shin | 2017-07-21 | 1 | -24/+24 |
| * | | | | | | Add a note that schedules could be deactivated | Lin Jen-Shin | 2017-07-21 | 1 | -3/+4 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-20 | 302 | -866/+6952 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Use struct instead of hash | Lin Jen-Shin | 2017-07-20 | 5 | -19/+20 |
| * | | | | | | | Make permission checks easier to understand | Lin Jen-Shin | 2017-07-20 | 1 | -6/+6 |
| * | | | | | | | Use hash to return multiple objects | Lin Jen-Shin | 2017-07-20 | 5 | -25/+25 |
| * | | | | | | | Fix tests and fine tweak permission error message | Lin Jen-Shin | 2017-07-19 | 2 | -7/+9 |
| * | | | | | | | Eliminate N+1 queries on checking different protected refs | Lin Jen-Shin | 2017-07-19 | 2 | -11/+28 |
| * | | | | | | | Add a test for checking queries with different ref | Lin Jen-Shin | 2017-07-19 | 1 | -6/+27 |
| * | | | | | | | Try to merge permission checks into one | Lin Jen-Shin | 2017-07-19 | 1 | -10/+10 |
| * | | | | | | | Instead of adding master, stub_not_protect_default_branch | Lin Jen-Shin | 2017-07-18 | 14 | -29/+66 |
| * | | | | | | | Rename :user_cannot_update to :protected_ref | Lin Jen-Shin | 2017-07-18 | 2 | -4/+4 |
| * | | | | | | | Unify build policy tests and pipeline policy tests | Lin Jen-Shin | 2017-07-18 | 2 | -13/+32 |
| * | | | | | | | Rename can_push_or_merge_to_branch? to can_update_branch? | Lin Jen-Shin | 2017-07-18 | 4 | -6/+10 |
| * | | | | | | | Restore some tests from master | Lin Jen-Shin | 2017-07-18 | 1 | -5/+33 |
| * | | | | | | | Remove old request store wrap | Lin Jen-Shin | 2017-07-18 | 2 | -167/+0 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-18 | 50 | -231/+533 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-17 | 1668 | -10027/+20733 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make message and code more clear | Lin Jen-Shin | 2017-07-06 | 1 | -2/+5 |
| * | | | | | | | | | Merge allowed_to_create? into CreatePipelineService | Lin Jen-Shin | 2017-07-05 | 6 | -128/+122 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-05 | 95 | -496/+2706 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Don't extend from struct as rubocop suggests | Lin Jen-Shin | 2017-07-04 | 1 | -1/+9 |
| * | | | | | | | | | | Add test for RequestStoreWrap | Lin Jen-Shin | 2017-07-04 | 1 | -0/+99 |
| * | | | | | | | | | | Make sure that retryable_builds would preload project | Lin Jen-Shin | 2017-07-04 | 1 | -1/+1 |
| * | | | | | | | | | | Introduce Gitlab::Cache::RequestStoreWrap | Lin Jen-Shin | 2017-07-04 | 3 | -3/+69 |
| * | | | | | | | | | | Update tests due to permission changes | Lin Jen-Shin | 2017-07-04 | 14 | -46/+51 |
| * | | | | | | | | | | Fix bad conflict resolution | Lin Jen-Shin | 2017-07-04 | 4 | -19/+21 |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline | Lin Jen-Shin | 2017-07-04 | 281 | -2168/+5780 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Consistently check permission for creating pipelines, | Lin Jen-Shin | 2017-07-04 | 6 | -42/+93 |