summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Remove superfluous lib: true, type: redis, service: true, models: true, ↵Rémy Coutable2017-07-27495-498/+498
| | | | | | services: true, no_db: true, api: true Signed-off-by: Rémy Coutable <remy@rymai.me>
* Remove superfluous type defs in specsKeifer Furzland2017-07-27349-361/+361
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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 only local See merge request !13125
| * Ensure the overriding of Gitlab::Application.routes.default_url_options is ↵rc/35599-stop-the-bleeding-of-default_url_optionsRémy Coutable2017-07-271-0/+4
| | | | | | | | | | | | only local Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-274-7/+145
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154
| * | 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-members Closes #35191 See merge request !12912
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add author_id & assignee_id param to /issues API Closes #29430 See merge request !13004
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Allow issues filtering on `author_id` and `assignee_id`.
* | | | | Merge branch 'rc/fix-tests-factories' into 'master'Sean McGivern2017-07-276-9/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix the :project factory by not copying the test repo twice See merge request !13123
| * | | | Fix the :project factory by not copying the test repo twicerc/fix-tests-factoriesRémy Coutable2017-07-276-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fixing some calls to the :project factory with the :test_repo trait since this trait is already included in the :project factory. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch ↵Rémy Coutable2017-07-275-4/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters' into 'master' Resolve "Can't create a merge request containing a binary file with non-UTF-8 characters" Closes #35539 See merge request !13086
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we used Psych, which would: 1. Check if a string was encoded as binary, and not ASCII-compatible. 2. Add the !binary tag in that case. 3. Convert to base64. We need to do the same thing, using a new column in place of the tag.
* | | | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just ↵Casper2017-07-261-3/+3
|/ / / / | | | | | | | | | | | | hard-coded attributes.
* | | | Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'Kamil Trzciński2017-07-261-0/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle maximum pages artifacts size correctly Closes #35317 See merge request !13072
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle errors while a project is being deleted asynchronously. Closes #29289 See merge request !11088
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Rescue all errors that `Projects::DestroyService` might throw, to prevent the worker from leaving things in an inconsistent state 2. Unmark the project as `pending_delete` 3. Add a `delete_error` text column to `projects`, and save the error message in there, to be shown to the project masters/owners.
* | | | | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-19/+229
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * | | | | | Fix plain LDAP (no encryption)Michael Kozono2017-07-261-1/+1
| | | | | | |
| * | | | | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And closer to the configuration setup. The code doesn’t need to know about this.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The method key is deprecated in the `gitlab_omniauth-ldap` gem.
* | | | | | | 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 default See merge request !13078
| * | | | | | | 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' ↵Sean McGivern2017-07-261-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fixes 500 error caused by pending delete projects in admin dashboard Closes #35453 See merge request !13067
| * | | | | | | 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 RepositoryService See merge request !13019
| * | | | | | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-262-6/+29
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' ↵Sean McGivern2017-07-261-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Pending delete projects should now show in deploy keys Closes #35338 See merge request !13088
| * | | | | | | 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 configuration Closes #31129 See merge request !12050
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2073-122/+1517
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (130 commits) Change auto-retry count to a correct value in docs Fix background migration cleanup specs Fix CI/CD job auto-retry specs Fix JS; make buttons sr accessibile; fix overlay remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules ...
| * | | | | | | Use struct instead of hashLin Jen-Shin2017-07-201-12/+12
| | | | | | | |
View Lorry Controller Status