summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-254-22/+47
|\
| * Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2020-58/+178
| |\
| * | Use struct instead of hashLin Jen-Shin2017-07-203-5/+5
| * | Use hash to return multiple objectsLin Jen-Shin2017-07-203-8/+8
| * | 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-1814-47/+182
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-17120-874/+1550
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-059-47/+217
| |\ \ \ \
| * | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-042-2/+68
| * | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0425-91/+1380
| |\ \ \ \ \
| * | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-041-0/+4
| * | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-29200-1079/+2621
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-075-33/+96
| |\ \ \ \ \ \ \
| * | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-063-10/+13
* | | | | | | | | Merge branch 'issue_34622' into 'master'Sean McGivern2017-07-257-157/+282
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add group milestones API endpointissue_34622Felipe Artur2017-07-217-157/+282
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-free-unused-names' into 'master'Dmitriy Zaporozhets2017-07-251-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
* | | | | | | | | | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-255-2/+112
|/ / / / / / / / /
* | | | | | | | | Resolve "Lazy load images on the Frontend"Tim Zallmann2017-07-245-2/+20
* | | | | | | | | 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-246-16/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-246-16/+24
| |/ / / / / / / / /
* | | | | | | | | | 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
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix support for old CI API when image or services are not specifiedfix-old-ci-apiKamil Trzcinski2017-07-221-1/+1
* | | | | | | | | | 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
| |/ / / / / / / / /