summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-27495-498/+498
* Remove superfluous type defs in specsKeifer Furzland2017-07-27349-361/+361
* Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'Sean McGivern2017-07-271-0/+4
|\
| * Ensure the overriding of Gitlab::Application.routes.default_url_options is on...rc/35599-stop-the-bleeding-of-default_url_optionsRémy Coutable2017-07-271-0/+4
* | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-274-7/+145
|\ \
| * | Add specsDouwe Maan2017-07-274-7/+145
| * | Remove spec/lib/api/helpers/csrf_tokens_spec.rbblackst0ne2017-07-261-42/+0
| * | Add CSRF token verification to APIblackst0ne2017-07-261-0/+42
* | | Merge branch '35191-prioritized-labels-for-non-member' into 'master'Rémy Coutable2017-07-271-0/+8
|\ \ \
| * | | Remove help message about prioritized labels for non-membersTakuya Noguchi2017-07-271-0/+8
* | | | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-271-1/+36
|\ \ \ \
| * | | | Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-241-4/+12
| * | | | Add author_id & assignee_id param to /issues APIToon Claes2017-07-241-0/+27
* | | | | Merge branch 'rc/fix-tests-factories' into 'master'Sean McGivern2017-07-276-9/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix the :project factory by not copying the test repo twicerc/fix-tests-factoriesRémy Coutable2017-07-276-9/+5
* | | | | Merge branch '35539-can-t-create-a-merge-request-containing-a-binary-file-wit...Rémy Coutable2017-07-275-4/+40
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix saving diffs that are not valid UTF-835539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-charactersSean McGivern2017-07-265-4/+40
* | | | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-c...Casper2017-07-261-3/+3
|/ / / /
* | | | 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
View Lorry Controller Status