summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loadingTim Zallmann2019-04-103-129/+73
| | | | Reverts the loading of emojis and its images to move forward with RC
* Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'Rémy Coutable2019-04-102-0/+6
|\ | | | | | | | | CE: Resolve "Support fast unit tests in EE" See merge request gitlab-org/gitlab-ce!26861
| * Require possible EE extensionLin Jen-Shin2019-04-102-0/+6
| |
* | Quarantine flaky specsquarantine-flaky-specsRémy Coutable2019-04-104-4/+4
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'winh-jest-valid-describe' into 'master'Kushal Pandya2019-04-106-12/+13
|\ | | | | | | | | Enable ESLint rule jest/valid-describe See merge request gitlab-org/gitlab-ce!27140
| * Wrap modal mutation names in template stringswinh-jest-valid-describeWinnie Hellmann2019-04-101-3/+3
| |
| * Hard code test name in timeline_entry_item_spec.jsWinnie Hellmann2019-04-101-1/+1
| |
| * Hard code test name in suggestion_diff_row_spec.jsWinnie Hellmann2019-04-101-1/+1
| |
| * Wrap import project mutation names in template stringsWinnie Hellmann2019-04-101-2/+2
| |
| * Wrap file template mutation names in template stringsWinnie Hellmann2019-04-101-5/+5
| |
| * Enable ESLint rule jest/valid-describeWinnie Hellmann2019-04-101-0/+1
| |
* | Merge branch '6623-extract-ee-specific-files-lines-for-ci-spec-serializers' ↵Yorick Peterse2019-04-101-2/+4
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Resolve "Extract EE specific files/lines for CI spec/serializers" See merge request gitlab-org/gitlab-ce!27214
| * | Use different query count expectations in EE6623-extract-ee-specific-files-lines-for-ci-spec-serializersMatija Čupić2019-04-101-2/+4
| | |
* | | Merge branch '6073-extract-ee-specific-files-lines-for-some-ci-files' into ↵Yorick Peterse2019-04-101-3/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Extract EE specific files/lines for some CI files" Closes gitlab-ee#6073 See merge request gitlab-org/gitlab-ce!27210
| * | Add optional IGNORE_ACCESSORS in RetryBuildService6073-extract-ee-specific-files-lines-for-some-ci-filesMatija Čupić2019-04-101-3/+5
| | |
* | | Add time tracking to issue board entitiespataar2019-04-101-0/+3
| |/ |/|
* | Merge branch 'increase-rspec-retries' into 'master'Rémy Coutable2019-04-101-2/+2
|\ \ | | | | | | | | | | | | Double retries for rspec-retries See merge request gitlab-org/gitlab-ce!27208
| * | Double retries for rspec-retriesLin Jen-Shin2019-04-101-2/+2
| |/ | | | | | | It was 2*4 => 8 times before, so 4 times is still half retries
* | Merge branch 'quarantine-flaky-specs' into 'master'Kamil Trzciński2019-04-101-1/+1
|\ \ | |/ |/| | | | | Quarantine a flaky spec in spec/features/issues/user_creates_branch_and_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!27202
| * Quarantine a flaky spec in ↵Rémy Coutable2019-04-101-1/+1
| | | | | | | | | | | | spec/features/issues/user_creates_branch_and_merge_request_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '47327-fix-github-project-import-visibility' into 'master'Douwe Maan2019-04-101-3/+13
|\ \ | |/ |/| | | | | Fix GitHub project import visibility See merge request gitlab-org/gitlab-ce!27133
| * Address style review commentDaniel Wyatt2019-04-091-2/+0
| |
| * Add test for github project import to user namespace.Daniel Wyatt2019-04-091-0/+12
| |
| * Fix GitHub project import visibilityDaniel Wyatt2019-04-081-2/+2
| |
* | Merge branch 'revert-2cc01f12' into 'master'Rémy Coutable2019-04-101-48/+1
|\ \ | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'" Closes #60315 See merge request gitlab-org/gitlab-ce!27195
| * | Revert "Merge branch 'sh-optimize-projects-api' into 'master'"revert-2cc01f12Stan Hu2019-04-101-48/+1
| | | | | | | | | This reverts merge request !26481
* | | Add more info logging to cluster appsDylan Griffith2019-04-102-1/+28
|/ / | | | | | | | | Log events so that it's easy to see when different requests are starting.
* | Merge branch '60305-fix-mr-assignee-for-mr-push-options' into 'master'Douglas Barbosa Alexandre2019-04-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix MR assignees for push options Closes #60305 See merge request gitlab-org/gitlab-ce!27186
| * | Fix MR assignees for push optionsNick Thomas2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | With multiple MR assignees, `merge_request.assignee_id` is always nil, and `merge_request.assignee_ids` isn't in `merge_request.attributes`. So the existing code doesn't set assignees in the created MR. This fix gets all the tests passing, but we should also check that no other associations in the MergeRequest need similar fixups.
* | | Quarantine flaky testMichael Kozono2019-04-091-1/+1
|/ /
* | Mark unverified pages domains for removalVladimir Shushlin2019-04-093-21/+96
| | | | | | | | | | | | | | Set pages_domain.remove_at when disabling it Add specs for marking pages domain for removal Notify user that domain is being removed Add documentation
* | Merge branch 'quarantine-flaky-specs' into 'master'Kamil Trzciński2019-04-091-1/+1
|\ \ | | | | | | | | | | | | Quarantine a flaky spec in spec/features/issues/user_interacts_with_awards_spec.rb See merge request gitlab-org/gitlab-ce!27176
| * | Quarantine a flaky spec in ↵Rémy Coutable2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | spec/features/issues/user_interacts_with_awards_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-0964-22/+2206
| | | | | | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | | Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-0958-408/+810
|\ \ \ | |/ / |/| | | | | | | | [Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
| * | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-0858-408/+810
| | | | | | | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | | Add new permission model `read-pipeline-variable`Agustin Henze2019-04-092-0/+112
| | | | | | | | | | | | | | | | | | | | | Used to get the variables via the API endpoint `/projects/:id/pipelines/:pipeline_id/variables` Signed-off-by: Agustin Henze <tin@redhat.com>
* | | Merge branch 'winh-jest-no-identical-title' into 'master'Clement Ho2019-04-092-48/+46
|\ \ \ | | | | | | | | | | | | | | | | Enable ESLint rule jest/no-identical-title See merge request gitlab-org/gitlab-ce!27139
| * | | Refactor diff_spec.js to use table-based testswinh-jest-no-identical-titleWinnie Hellmann2019-04-081-48/+45
| | | |
| * | | Enable ESLint rule jest/no-identical-titleWinnie Hellmann2019-04-081-0/+1
| |/ /
* | | Merge branch '59570-due-quick-action' into 'master'James Lopez2019-04-092-43/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extract due quick action to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26918
| * | | Extract due quick action to shared example59570-due-quick-actionAlexandru Croitor2019-04-082-43/+26
| | | |
* | | | Merge branch 'quarantine-flaky-specs' into 'master'Lin Jen-Shin2019-04-094-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Quarantine flaky specs See merge request gitlab-org/gitlab-ce!27170
| * | | | Quarantine flaky specsRémy Coutable2019-04-094-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to: - https://gitlab.com/gitlab-org/gitlab-ce/issues/60270 - https://gitlab.com/gitlab-org/gitlab-ce/issues/60271 - https://gitlab.com/gitlab-org/gitlab-ce/issues/60272 - https://gitlab.com/gitlab-org/gitlab-ce/issues/60273 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-094-16/+595
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Git push options to create a merge request, set target_branch and set merge when pipeline succeeds Closes #53198 and #43263 See merge request gitlab-org/gitlab-ce!26752
| * | | | Update service to handle unexpected exceptions43263-git-push-option-to-create-mrLuke Duncalfe2019-04-091-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure that now and in the future, PushOptionsHandlerService will not cause the post_receive API endpoint from running other code if something causes an unknown exception.
| * | | | Feature flag for merge requestion push optionsLuke Duncalfe2019-04-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/43263 https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
| * | | | Refactor PushOptionsHandlerService from reviewLuke Duncalfe2019-04-092-48/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exceptions are no longer raised, instead all errors encountered are added to the errors property. MergeRequests::BuildService is used to generate attributes of a new merge request. Code moved from Api::Internal to Api::Helpers::InternalHelpers.
| * | | | Support merge on pipeline success w/ push optionsLuke Duncalfe2019-04-091-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `merge_when_pipeline_succeeds` set using git push options. To create a new merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.create \ -o merge_request.merge_when_pipeline_succeeds To update an existing merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.merge_when_pipeline_succeeds Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
| * | | | Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-093-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the raw push option Array was sent to Pipeline::Chain::Skip. This commit updates this class (and the chain of classes that pass the push option parameters from the API internal `post_receive` endpoint to that class) to treat push options as a Hash of options parsed by GitLab::PushOptions. The GitLab::PushOptions class takes options like this: -o ci.skip -o merge_request.create -o merge_request.target=branch and turns them into a Hash like this: { ci: { skip: true }, merge_request: { create: true, target: 'branch' } } This now how Pipeline::Chain::Skip is determining if the `ci.skip` push option was used.