summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Set `Net::LDAP` `ssl_version` optionmk-add-ldap-ssl-certificate-verificationMichael Kozono2017-06-092-0/+31
* Set `Net::LDAP` `ca_file` optionMichael Kozono2017-06-092-5/+45
* Set `Net::LDAP` encryption properlyMichael Kozono2017-06-092-19/+117
* Use encryption instead of methodMichael Kozono2017-06-092-16/+16
* Add LDAP config optionsMichael Kozono2017-06-092-1/+34
* Upgrade omniauth-ldap gem (and some dependencies)Michael Kozono2017-06-092-9/+9
* Merge branch '33323-fix-incorrect-project-authorizations' into 'security-9-2'Douwe Maan2017-06-084-3/+60
|\
| * Escape the underscore char inside the LIKE operatorRuben Davila2017-06-084-3/+60
|/
* Merge branch '24570-use-re2-for-user-supplied-regexp' into 'security-9-2'Douwe Maan2017-06-079-4/+174
|\
| * Use re2 for user-supplied regexpsNick Thomas2017-06-019-4/+174
* | Merge branch 'bvl-fix-typo-renaming-appearance' into 'security-9-2'Douwe Maan2017-06-073-2/+59
|\ \
| * | Freeze strings that can be frozenBob Van Landuyt2017-06-072-5/+2
| * | Add migration to rename `appearance` folder.Bob Van Landuyt2017-06-062-1/+61
| * | Fix typo in `appearance`Bob Van Landuyt2017-06-061-1/+1
|/ /
* | Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-0114-18/+210
|\ \
| * | Fix visibility when referencing snippetsJarka Kadlecova2017-06-0114-18/+210
* | | Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-013-2/+13
|\ \ \ | |_|/ |/| |
| * | Adjust namespace_spec to check moving uploadsBob Van Landuyt2017-06-011-1/+1
| * | Move the uploads in the correct folder when moving project/namespaceBob Van Landuyt2017-06-012-1/+12
|/ /
* | Merge branch 'bvl-fix-security-9-2-conflicts' into 'security-9-2'Timothy Andrew2017-05-26117-745/+1594
|\ \
| * | Resolve conflicts in DynamicPathValidatorBob Van Landuyt2017-05-262-178/+1
| * | Merge remote-tracking branch 'origin/9-2-stable' into security-9-2Timothy Andrew2017-05-26117-571/+1597
| |\ \ |/ / /
| * | Update VERSION to 9.2.2v9.2.2Regis2017-05-251-1/+1
| * | Update CHANGELOG.md for 9.2.2Regis2017-05-253-8/+5
| * | Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-255-1/+26
| * | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-2516-434/+635
| * | Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-253-5/+13
| * | Merge branch '32828-refresh-build' into 'master'Phil Hughes2017-05-251-1/+1
| * | Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-245-32/+37
| * | Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-243-89/+91
| * | Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-249-1/+104
| * | Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-241-0/+4
| * | Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-242-10/+10
| * | Update VERSION to 9.2.1v9.2.1Clement Ho2017-05-231-1/+1
| * | Update CHANGELOG.md for 9.2.1Clement Ho2017-05-233-8/+5
| * | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-2312-28/+27
| * | Merge branch 'fix/gb/remove-ci-models-from-eager-load-paths' into 'master' Rémy Coutable2017-05-231-1/+0
| * | Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew2017-05-232-11/+23
| * | Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' i...Fatih Acet2017-05-231-3/+2
| * | Merge branch '32496-admin-tabs' into 'master'Phil Hughes2017-05-231-35/+36
| * | Merge branch 'fix-retried-for-postgres' into 'master'Kushal Pandya2017-05-234-7/+13
| * | Fix cherry pick docClement Ho2017-05-221-12/+0
| * | Merge branch 'docs/new-topic-issues' into 'master'Sean Packham (GitLab)2017-05-2234-40/+182
| * | Merge branch 'auto-update-docs' into 'master'Clement Ho2017-05-220-0/+0
| * | Merge branch 'docs/artifacts-preview' into 'master'Sean Packham (GitLab)2017-05-221-0/+4
| * | Merge branch '32604-add-docs-for-change-of-cache-artifact-restore-order' into...Achilleas Pipinellis2017-05-221-1/+7
| * | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-223-4/+8
| * | Merge branch 'docs/deploys-perf-dashboard' into 'master'Sean Packham (GitLab)2017-05-224-12/+49
| * | Merge branch 'change_pipelines_schedules_help_page_path' into 'master'Rémy Coutable2017-05-222-3/+3
| * | Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-222-4/+4
View Lorry Controller Status