| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix participant name link trailing space on milestone pagefix-participant-name-trailing | Clement Ho | 2017-07-26 | 1 | -2/+2 |
* | Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master' | Kamil TrzciĆski | 2017-07-26 | 3 | -1/+81 |
|\ |
|
| * | Refactor max_size method in update pages servicefix/gb/handle-max-pages-artifacts-size-correctly | Grzegorz Bizon | 2017-07-26 | 1 | -3/+5 |
| * | Fix rubocop offense in update pages service specs | Grzegorz Bizon | 2017-07-25 | 1 | -1/+1 |
| * | Add changelog for max pages artifacts size fix | Grzegorz Bizon | 2017-07-25 | 1 | -0/+4 |
| * | Handle maximum pages artifacts size correctly | Grzegorz Bizon | 2017-07-25 | 2 | -1/+75 |
* | | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master' | Sean McGivern | 2017-07-26 | 0 | -0/+0 |
|\ \ |
|
* \ \ | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master' | Sean McGivern | 2017-07-26 | 13 | -49/+185 |
|\ \ \
| |/ / |
|
| * | | Move exception handling to execute | Tiago Botelho | 2017-07-26 | 10 | -76/+81 |
| * | | Refactors Project Destroy service and worker code | Tiago Botelho | 2017-07-20 | 2 | -21/+28 |
| * | | Add specs for ProjectDestroyWorker | Tiago Botelho | 2017-07-20 | 9 | -49/+63 |
| * | | WIP: Display a project's `delete_error` on the project homepage. | Timothy Andrew | 2017-07-20 | 2 | -0/+10 |
| * | | Handle errors while a project is being deleted asynchronously. | Timothy Andrew | 2017-07-20 | 6 | -4/+104 |
* | | | Merge remote-tracking branch 'dev/master' | Douwe Maan | 2017-07-26 | 9 | -55/+391 |
|\ \ \ |
|
| * \ \ | Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master' | Douwe Maan | 2017-07-26 | 9 | -64/+400 |
| |\ \ \ |
|
| | * | | | Add net-ldap explicitly since we use it directly | Michael Kozono | 2017-07-26 | 2 | -0/+2 |
| | * | | | Mention how to test LDAP connections | Michael Kozono | 2017-07-26 | 1 | -1/+2 |
| | * | | | Fix plain LDAP (no encryption) | Michael Kozono | 2017-07-26 | 4 | -7/+10 |
| | * | | | Update more examples | Michael Kozono | 2017-07-26 | 2 | -3/+4 |
| | * | | | Add changelog entry | Michael Kozono | 2017-07-26 | 1 | -0/+4 |
| | * | | | Change encryption description | Michael Kozono | 2017-07-26 | 1 | -11/+16 |
| | * | | | Copy comment improvements from documentation | Michael Kozono | 2017-07-26 | 1 | -4/+11 |
| | * | | | Update LDAP SSL config options | Michael Kozono | 2017-07-26 | 1 | -4/+32 |
| | * | | | Fix code style | Michael Kozono | 2017-07-26 | 1 | -5/+5 |
| | * | | | Add warning about certificate verification on load | Michael Kozono | 2017-07-26 | 1 | -1/+10 |
| | * | | | Move backwards compatibility logic out of the code | Michael Kozono | 2017-07-26 | 3 | -30/+6 |
| | * | | | Pass configured `ssl_version` to `omniauth-ldap` | Michael Kozono | 2017-07-26 | 2 | -0/+33 |
| | * | | | Pass configured `ca_file` to `omniauth-ldap` | Michael Kozono | 2017-07-26 | 2 | -0/+34 |
| | * | | | 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 'mk-fix-master-wiki-web-url-spec' into 'master' | Douwe Maan | 2017-07-26 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Fix project wiki web_url spec | Michael Kozono | 2017-07-26 | 1 | -1/+1 |
* | | | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master' | Yorick Peterse | 2017-07-26 | 4 | -1/+41 |
|\ \ \ \ \ |
|
| * | | | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routes | Michael Kozono | 2017-07-25 | 4 | -1/+41 |
* | | | | | | Merge branch 'add-missing-colon' into 'master' | Sean McGivern | 2017-07-26 | 1 | -1/+1 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Add missing colon | Max Raab | 2017-07-26 | 1 | -1/+1 |
|/ / / / / |
|
* | | | | | Merge branch 'post-upload-pack-opt-out' into 'master' | Sean McGivern | 2017-07-26 | 3 | -2/+10 |
|\ \ \ \ \ |
|
| * | | | | | Enable gitaly_post_upload_pack by default | Jacob Vosmaer | 2017-07-25 | 3 | -2/+10 |
* | | | | | | Merge branch '34110-memory-usage-notice-doesn-t-link-anywhere' into 'master' | Phil Hughes | 2017-07-26 | 6 | -3/+24 |
|\ \ \ \ \ \ |
|
| * | | | | | | Resolve "Memory usage notice doesn't link anywhere" | Tim Zallmann | 2017-07-26 | 6 | -3/+24 |
|/ / / / / / |
|
* | | | | | | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int... | Sean McGivern | 2017-07-26 | 3 | -1/+26 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fix | Tiago Botelho | 2017-07-25 | 3 | -1/+26 |
* | | | | | | | Merge branch 'zj-repo-exists-gitaly' into 'master' | Sean McGivern | 2017-07-26 | 6 | -14/+62 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Implement GRPC call to RepositoryService | Z.J. van de Weg | 2017-07-26 | 6 | -14/+62 |
* | | | | | | | | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into... | Sean McGivern | 2017-07-26 | 3 | -2/+8 |
|\ \ \ \ \ \ \ \ |
|