summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'Kamil Trzciński2017-07-261-0/+72
|\
| * Fix rubocop offense in update pages service specsGrzegorz Bizon2017-07-251-1/+1
| * Handle maximum pages artifacts size correctlyGrzegorz Bizon2017-07-251-0/+72
* | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-264-11/+104
|\ \
| * | Move exception handling to executeTiago Botelho2017-07-263-44/+30
| * | Add specs for ProjectDestroyWorkerTiago Botelho2017-07-202-4/+47
| * | Handle errors while a project is being deleted asynchronously.Timothy Andrew2017-07-202-0/+64
* | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-19/+229
|\ \ \
| * | | Fix plain LDAP (no encryption)Michael Kozono2017-07-261-1/+1
| * | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-24/+0
| * | | Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-261-0/+31
| * | | Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-261-0/+33
| * | | Verify certificates in `omniauth-ldap`Michael Kozono2017-07-261-0/+30
| * | | Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-261-0/+30
| * | | Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-261-0/+30
| * | | Set `Net::LDAP` encryption properlyMichael Kozono2017-07-261-11/+91
| * | | Use encryption instead of methodMichael Kozono2017-07-261-14/+14
* | | | Fix project wiki web_url specMichael Kozono2017-07-261-1/+1
* | | | Merge branch 'post-upload-pack-opt-out' into 'master'Sean McGivern2017-07-261-1/+2
|\ \ \ \
| * | | | Enable gitaly_post_upload_pack by defaultJacob Vosmaer2017-07-251-1/+2
* | | | | Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-262-0/+3
* | | | | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-261-0/+21
|\ \ \ \ \
| * | | | | Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-0/+21
* | | | | | Merge branch 'zj-repo-exists-gitaly' into 'master'Sean McGivern2017-07-262-6/+29
|\ \ \ \ \ \
| * | | | | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-262-6/+29
* | | | | | | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into...Sean McGivern2017-07-261-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Pending delete projects should not show in deploy keys35338-deploy-keys-should-not-show-pending-delete-projectsTiago Botelho2017-07-251-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-263-22/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-253-22/+11
| |/ / / / /
* | | | | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-2524-109/+432
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2073-122/+1517
| |\ \ \ \ \ \
| * | | | | | | Use struct instead of hashLin Jen-Shin2017-07-201-12/+12
| * | | | | | | Use hash to return multiple objectsLin Jen-Shin2017-07-201-13/+13
| * | | | | | | Add a test for checking queries with different refLin Jen-Shin2017-07-191-6/+27
| * | | | | | | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-1814-29/+66
| * | | | | | | Unify build policy tests and pipeline policy testsLin Jen-Shin2017-07-182-13/+32
| * | | | | | | Restore some tests from masterLin Jen-Shin2017-07-181-5/+33
| * | | | | | | Remove old request store wrapLin Jen-Shin2017-07-181-107/+0
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1813-77/+212
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-17599-3005/+8072
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merge allowed_to_create? into CreatePipelineServiceLin Jen-Shin2017-07-052-97/+100
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0527-237/+629
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't extend from struct as rubocop suggestsLin Jen-Shin2017-07-041-1/+9
| * | | | | | | | | | Add test for RequestStoreWrapLin Jen-Shin2017-07-041-0/+99
| * | | | | | | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-041-1/+1
| * | | | | | | | | | Update tests due to permission changesLin Jen-Shin2017-07-0414-46/+51
| * | | | | | | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-042-8/+8
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0467-561/+1348
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-042-35/+64
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-292-0/+137
| |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status