summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use params#require instead params[] accessbackport-ee-2456Oswaldo Ferreira2017-07-261-1/+1
* Backport gitlab-ee!2456Oswaldo Ferreira2017-07-2612-8/+57
* Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-262-4/+4
|\
| * Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-c...Casper2017-07-262-4/+4
|/
* Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'Kamil Trzciński2017-07-263-1/+81
|\
| * Refactor max_size method in update pages servicefix/gb/handle-max-pages-artifacts-size-correctlyGrzegorz Bizon2017-07-261-3/+5
| * Fix rubocop offense in update pages service specsGrzegorz Bizon2017-07-251-1/+1
| * Add changelog for max pages artifacts size fixGrzegorz Bizon2017-07-251-0/+4
| * Handle maximum pages artifacts size correctlyGrzegorz Bizon2017-07-252-1/+75
* | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-260-0/+0
|\ \
* \ \ Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-2613-49/+185
|\ \ \ | |/ /
| * | Move exception handling to executeTiago Botelho2017-07-2610-76/+81
| * | Refactors Project Destroy service and worker codeTiago Botelho2017-07-202-21/+28
| * | Add specs for ProjectDestroyWorkerTiago Botelho2017-07-209-49/+63
| * | WIP: Display a project's `delete_error` on the project homepage.Timothy Andrew2017-07-202-0/+10
| * | Handle errors while a project is being deleted asynchronously.Timothy Andrew2017-07-206-4/+104
* | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-269-55/+391
|\ \ \
| * \ \ Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master'Douwe Maan2017-07-269-64/+400
| |\ \ \
| | * | | Add net-ldap explicitly since we use it directlyMichael Kozono2017-07-262-0/+2
| | * | | Mention how to test LDAP connectionsMichael Kozono2017-07-261-1/+2
| | * | | Fix plain LDAP (no encryption)Michael Kozono2017-07-264-7/+10
| | * | | Update more examplesMichael Kozono2017-07-262-3/+4
| | * | | Add changelog entryMichael Kozono2017-07-261-0/+4
| | * | | Change encryption descriptionMichael Kozono2017-07-261-11/+16
| | * | | Copy comment improvements from documentationMichael Kozono2017-07-261-4/+11
| | * | | Update LDAP SSL config optionsMichael Kozono2017-07-261-4/+32
| | * | | Fix code styleMichael Kozono2017-07-261-5/+5
| | * | | Add warning about certificate verification on loadMichael Kozono2017-07-261-1/+10
| | * | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-263-30/+6
| | * | | Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-262-0/+33
| | * | | Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-262-0/+34
| | * | | 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 'mk-fix-master-wiki-web-url-spec' into 'master'Douwe Maan2017-07-261-1/+1
|\ \ \ \
| * | | | Fix project wiki web_url specMichael Kozono2017-07-261-1/+1
* | | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'Yorick Peterse2017-07-264-1/+41
|\ \ \ \ \
| * | | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routesMichael Kozono2017-07-254-1/+41
* | | | | | Merge branch 'add-missing-colon' into 'master'Sean McGivern2017-07-261-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add missing colonMax Raab2017-07-261-1/+1
|/ / / / /
* | | | | Merge branch 'post-upload-pack-opt-out' into 'master'Sean McGivern2017-07-263-2/+10
|\ \ \ \ \
| * | | | | Enable gitaly_post_upload_pack by defaultJacob Vosmaer2017-07-253-2/+10
* | | | | | Merge branch '34110-memory-usage-notice-doesn-t-link-anywhere' into 'master'Phil Hughes2017-07-266-3/+24
|\ \ \ \ \ \
| * | | | | | Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-266-3/+24
|/ / / / / /
* | | | | | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-263-1/+26
|\ \ \ \ \ \
| * | | | | | Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-253-1/+26
View Lorry Controller Status