summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-0/+6
* Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-271-0/+31
|\
| * Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-261-0/+8
| * Add `rescue false`.blackst0ne2017-07-261-1/+1
| * Refactor CSRF protectionblackst0ne2017-07-261-0/+23
* | 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 '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 '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-251-7/+29
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2019-57/+176
| |\ \ \
| * | | | 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-189-28/+129
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1786-745/+1136
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-057-40/+196
| |\ \ \ \ \ \
| * | | | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-042-2/+68
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-049-30/+102
| |\ \ \ \ \ \ \
| * | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-041-0/+4
* | | | | | | | | 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
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' in...Robert Speicher2017-07-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use a unique feature name for Workhorse send blob migrationfix/use-another-gitaly-feature-name-for-workhorse-send-blobAhmad Sherif2017-07-241-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '31533-usage-data-projects-stats' into 'master'Sean McGivern2017-07-241-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Slack and JIRA services counts to Usage Data31533-usage-data-projects-statsJarka Kadlecova2017-07-241-2/+13
| |/ / / / / / /
* | | | | | | | Merge branch '33097-issue-tracker' into 'master'Sean McGivern2017-07-242-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-242-2/+7
| |/ / / / / / /
* | | | | | | | Upgrade the re2 gem to 1.1.0Nick Thomas2017-07-241-27/+3
* | | | | | | | Add space between words in language dropdownFilipa Lacerda2017-07-241-3/+3
|/ / / / / / /
* | | | | | | Short-circuit build coverage extraction for empty regexesNick Thomas2017-07-222-2/+7
* | | | | | | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-223-13/+14
|\ \ \ \ \ \ \
| * | | | | | | Reword success to passing for pipeline badgesZ.J. van de Weg2017-07-211-1/+2
| * | | | | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-213-12/+12
* | | | | | | | Fix the gcovr coverage regex by removing line separators before scanningNick Thomas2017-07-211-0/+1
* | | | | | | | Merge branch 'gitaly-tree-entries' into 'master'Rémy Coutable2017-07-212-24/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Incorporate CommitService.GetTreeEntries Gitaly callgitaly-tree-entriesAlejandro Rodríguez2017-07-202-24/+60
| |/ / / / / / /
View Lorry Controller Status