summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Implement commands to uninstall cluster applicationshelm_uninstall_commandThong Kuah2019-04-162-0/+98
| | | | | This is the backend part which just allows uninstalling Prometheus for now.
* Merge branch 'fe-fix-ee-diff-in-text-utility-spec' into 'master'Filipa Lacerda2019-04-121-8/+6
|\ | | | | | | | | Resolve CE/EE diff in text_utility_spec See merge request gitlab-org/gitlab-ce!27291
| * Resolve CE/EE diff in text_utility_specfe-fix-ee-diff-in-text-utility-specPaul Slaughter2019-04-111-8/+6
| |
* | Squashed commits and modified visibility level outputSara Ahbabou2019-04-122-0/+19
|/ | | | Added changelog and rebased
* Merge branch 'winh-notes_spec-timeout' into 'master'Fatih Acet2019-04-111-1/+1
|\ | | | | | | | | Increase timeout for notes_spec.js See merge request gitlab-org/gitlab-ce!27270
| * Increase timeout for notes_spec.jswinh-notes_spec-timeoutWinnie Hellmann2019-04-111-1/+1
| |
* | Improve project settings pageLuke Bennett2019-04-113-22/+44
| | | | | | | | Prioritize and simplify project settings content.
* | Merge branch '60398-increase-timeouts-clusters-bundle' into 'master'Phil Hughes2019-04-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Increase clusters bundle specs timeout Closes #60398 See merge request gitlab-org/gitlab-ce!27269
| * | Increase clusters bundle specs timeout60398-increase-timeouts-clusters-bundleEnrique Alcantara2019-04-111-1/+1
| | |
* | | Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-118-5/+483
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * | | Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-102-0/+4
| | | |
| * | | Fix UrlBlocker specSean McGivern2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newer version of HTTParty we now use will try harder to get a valid URL out of a relative one. Unfortunately, when there's no room (as was the case in this spec), the relative URL begins with `//`, which is actually a protocol-relative URL, not a simple path. Adding a room - which will always be the case in 'real life' - fixes this.
| * | | Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-108-5/+479
| | | | | | | | | | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | | | Merge branch 'fixed-web-ide-merge-request-review' into 'master'Kushal Pandya2019-04-112-0/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
| * | | | Fixes Web IDE not loading merge request filesPhil Hughes2019-04-112-0/+39
| | |_|/ | |/| | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
* | | | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-116-33/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
| * | | | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-116-33/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* | | | | Merge branch 'limit-amount-of-created-pipelines' into 'master'Grzegorz Bizon2019-04-111-3/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Process at most 4 pipelines during push See merge request gitlab-org/gitlab-ce!27205
| * | | | | Process at most 4 pipelines during pushlimit-amount-of-created-pipelinesKamil Trzciński2019-04-101-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a limitation that we will try to create pipeline for at most 4 first changes (branches and tags). This does not affect processing of Pipelines for Merge Requests, as each updated MR will have associated pipeline created.
* | | | | | Merge branch ↵Lin Jen-Shin2019-04-112-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requests' into 'master' [CE-port] Extract EE specific files/lines for spec/services/merge_requests See merge request gitlab-org/gitlab-ce!26977
| * | | | | | Fix naming of testce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requestsHeinrich Lee Yu2019-04-112-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ALso makes it consistent with EE
* | | | | | | Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'Sean McGivern2019-04-111-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against nil dereferenced_target Closes #60076 See merge request gitlab-org/gitlab-ce!27192
| * | | | | | | Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_targetJohn Cai2019-04-101-0/+7
| | | | | | | |
* | | | | | | | Merge branch 'winh-eslint-jest' into 'master'Phil Hughes2019-04-111-5/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable eslint-plugin-jest for Jest Closes #59636 See merge request gitlab-org/gitlab-ce!26715
| * | | | | | | | Replace individual ESLint rules with jest/recommendedwinh-eslint-jestWinnie Hellmann2019-04-101-5/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Delete static_fixtures.rb for static HAML fixturesWinnie Hellmann2019-04-113-30/+15
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Align UrlValidator to validate_url gem implementation.Thong Kuah2019-04-116-42/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: allow_nil, allow_blank, message. Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
* | | | | | | 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
| | |
View Lorry Controller Status