summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Use `empty_project` where possible in spec/features/issuablesRobert Speicher2017-07-272-3/+3
* Use `empty_project` where possible in spec/features/atomRobert Speicher2017-07-274-5/+5
* Use `empty_project` where possible in spec/features/profilesRobert Speicher2017-07-271-3/+3
* Use `empty_project` where possible in spec/features/exploreRobert Speicher2017-07-271-1/+1
* Use `empty_project` where possible in spec/features/groupsRobert Speicher2017-07-273-5/+5
* Use `empty_project` where possible in spec/features/adminRobert Speicher2017-07-274-11/+14
* Use `empty_project` where possible in spec/features/dashboardRobert Speicher2017-07-277-10/+10
* Merge branch '34319-remove-useless-type-definitions-from-specs' into 'master'Robert Speicher2017-07-27844-1249/+1249
|\
| * Use described_class when possibleRémy Coutable2017-07-27106-390/+390
| * 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 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into '...Douwe Maan2017-07-271-33/+32
|\ \
| * | use `.zero?` instead of `== 0`Pawel Chojnacki2017-07-261-1/+1
| * | Stop abusing subject to store results,Pawel Chojnacki2017-07-261-36/+29
| * | Ensure test files are deleted after testsPawel Chojnacki2017-07-251-0/+6
* | | Merge branch 'rc/fix-branches-api-endpoint' into 'master'Sean McGivern2017-07-2710-215/+377
|\ \ \
| * | | Fix the /projects/:id/repository/branches endpoint to handle dots in the bran...Rémy Coutable2017-07-2710-215/+377
| | |/ | |/|
* | | Merge branch 'feature/backup-custom-path' into 'master'Rémy Coutable2017-07-272-7/+74
|\ \ \ | |/ / |/| |
| * | Support custom directory in gitlab:backup:create taskMarkus Koller2017-07-272-7/+74
* | | 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