summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Resolve "Integrate new vue+vuex code base with new API and remove old haml code"Filipa Lacerda2018-10-1712-733/+805
| | | | | | |
* | | | | | | Resolve "In web editor, when delete a file, should navigate to enclosing ↵George Thomas2018-10-172-1/+73
|/ / / / / / | | | | | | | | | | | | | | | | | | directory"
* | | | | | enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-17220-108/+1149
| | | | | |
* | | | | | Merge branch '51712-no-promise-without-done-fail' into 'master'Mike Greiling2018-10-167-19/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 2. enable jasmine/no-promise-without-done-fail See merge request gitlab-org/gitlab-ce!22231
| * | | | | enable jasmine/no-promise-without-done-failJohann Hubert Sonntagbauer2018-10-167-19/+17
| | | | | |
* | | | | | Merge branch 'sh-fix-commit-signatures-error' into 'master'Douwe Maan2018-10-161-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit signature error when project is disabled Closes #50903 See merge request gitlab-org/gitlab-ce!22344
| * | | | | | Fix commit signature error when project is disabledStan Hu2018-10-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is disabled, visiting the home page would show, "An error occurred while loading commit signatures". This change checks that the user has permission to view the project to avoid unnecessary GPG signature lookups. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50903
* | | | | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵Douwe Maan2018-10-163-49/+92
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361
| * | | | | | Fix image webhook rewriting for uploadsSean McGivern2018-10-163-49/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for.
* | | | | | | Merge branch '52147-loading-state' into 'master'Mike Greiling2018-10-161-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes styling issues in test reports Closes #51386 and #52147 See merge request gitlab-org/gitlab-ce!22204
| * | | | | | | Adds a `js-` class to allow for specsFilipa Lacerda2018-10-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rspec was using a CSS class to check if the content was being rendered. Since the CSS has changed, the specs failed This commit replaces the CSS class with a `js-` prepended one to guarantee changing CSS won't break a pipeline
* | | | | | | | Merge branch 'test-usage-ping-in-timeout-case' into 'master'Robert Speicher2018-10-161-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that usage ping works when all counts time out See merge request gitlab-org/gitlab-ce!22358
| * | | | | | | | Verify that usage ping works when all counts time outSean McGivern2018-10-161-0/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '52477-add-iid-headers-to-emails' into 'master'Sean McGivern2018-10-161-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add IID headers to E-Mail notifications Closes #52477 See merge request gitlab-org/gitlab-ce!22263
| * | | | | | | | Add IID headers to E-Mail notificationsLukas Eipert2018-10-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These headers can be used to build URLs for API requests. Good examples would be Issues and Merge Requests
* | | | | | | | | Merge branch 'ide-file-templates-clear' into 'master'Filipa Lacerda2018-10-161-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed file templates not clearing in Web IDE Closes #52487 See merge request gitlab-org/gitlab-ce!22357
| * | | | | | | | Fixed file templates not clearing in Web IDEPhil Hughes2018-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the file templates would not be cleared after changing the template type. Previously the templates would get pushed into the array creating a list of templates for the different types. This changes that by clearing the templates array when the template type gets changed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52487
* | | | | | | | | Merge branch 'refactor-project-cluster-controller-specs' into 'master'Grzegorz Bizon2018-10-161-180/+106
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Project::ClustersController spec improvement See merge request gitlab-org/gitlab-ce!22346
| * | | | | | | | Revert back to go but use arguments for some casesThong Kuah2018-10-161-114/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been pointed out that `go` is used quite extensively so it's not an unknown idiam here at GitLab. And we have arguments with `go` which is a plus.
| * | | | | | | | Use subject in controller specThong Kuah2018-10-151-261/+202
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap out `go` method with subject which is the convention. Re-organize 'PUT update' to remove un-necessary context nesting. DRY up repeated blocks to `add_maintainer` and `sign_in`
* | | | | | | | Merge branch '51972-prometheus-not-showing-as-installed-even-though-it-is' ↵Sean McGivern2018-10-167-67/+108
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Prometheus not showing as installed, even though it is" Closes #51972 See merge request gitlab-org/gitlab-ce!22356
| * | | | | | | | Show available clusters when installed or updatedPeter Leitzen2018-10-167-67/+108
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit updating Prometheus (e.g. adding alerts) made it "updated" therefore not installed.
* | | | | | | | Merge branch 'rails5-fix-utf' into 'master'Sean McGivern2018-10-161-7/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use InvalidUTF8ErrorHandler only for rails 4 Closes #51908 See merge request gitlab-org/gitlab-ce!22340
| * | | | | | | Use InvalidUTF8ErrorHandler only for rails 4Jan Provaznik2018-10-131-7/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5 catches invalid UTF8 characters in querystring in a params middleware, errors are handled by a params middleware and raises a BadRequest exception. This means that these UTF8 errors are not raised deeper in application stack and these can't also be handled on application level. If we would want to have custom handler for these errors, we would have to create a new middleware and insert it before actionpack's params middleware and rescue BadRequest exceptions there. But there is no need to do this currently (see discussion on https://gitlab.com/gitlab-org/gitlab-ce/issues/51908)
* | | | | | | Merge branch 'da-fix-does-not-import-projects-over-ssh' into 'master'Stan Hu2018-10-163-23/+44
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Does not allow a SSH URI when importing a project See merge request gitlab-org/gitlab-ce!22309
| * | | | | | Does not allow an import_url with SSH protocolDouglas Barbosa Alexandre2018-10-153-23/+44
| | | | | | |
* | | | | | | Replace `<i>` in vue components with `<icon>`George Tsiolis2018-10-151-12/+2
|/ / / / / /
* | | | | | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-158-123/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * | | | | | Remove Koding integration and documentationStan Hu2018-10-128-123/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* | | | | | | Merge branch ↵Clement Ho2018-10-151-29/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' Allow Issue and Merge Request sidebar to be toggled from collapsed state Closes #52532 See merge request gitlab-org/gitlab-ce!22353
| * | | | | | | Remove unused eslint disableClement Ho2018-10-151-1/+1
| | | | | | | |
| * | | | | | | Remove obsolete usage of gl.lazyLoader.loadCheckLukas Eipert2018-10-151-28/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In [!21565][0] we removed the loadCheck function from the LazyLoader for images. The function seemed to be obsolete before anyhow, because we make use of the MutationObserver in order to detect elements added / removed from the DOM. [0]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21565
* | | | | | | Merge branch 'qa-add-a-cop-to-forbit-element-with-pattern' into 'master'Stan Hu2018-10-152-0/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new QA::ElementWithPattern cop Closes #52516 See merge request gitlab-org/gitlab-ce!22298
| * | | | | | | Add a new QA::ElementWithPattern copRémy Coutable2018-10-152-0/+87
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cop forbids the use of `element :foo, 'pattern'` and `element :bar, /pattern/` in QA files. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'bvl-merge-base-multiple-revisions' into 'master'Douwe Maan2018-10-152-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow getting the merge base of multiple revisions Closes #52573 See merge request gitlab-org/gitlab-ce!22295
| * | | | | | | Allow getting the merge base of multiple revisionsBob Van Landuyt2018-10-122-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API
* | | | | | | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-155-25/+147
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
| * | | | | | | | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-125-25/+147
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* | | | | | | | Merge branch '34758-refactor-cluster-services' into 'master'Dmitriy Zaporozhets2018-10-152-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Cluster services to enable groups or projects See merge request gitlab-org/gitlab-ce!22181
| * | | | | | | | Pass in project as kwarg for CreateServiceThong Kuah2018-10-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to have other options in the future such as passing in `group:`. Also, remove project arg from UpdateService, as un-used. This will help group cluster controller to re-use this services.
* | | | | | | | | Merge branch '52669-fixes-quick-actions-preview' into 'master'Douglas Barbosa Alexandre2018-10-151-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requests Closes #52669 See merge request gitlab-org/gitlab-ce!22343
| * | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requestsJacopo2018-10-151-0/+9
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close/reopen quick actions preview wasn't shown properly, now the preview is shown as expected.
* | | | | | | | | Merge branch '34758-fix-code-reuse-clusters-applications_controller' into ↵Dmitriy Zaporozhets2018-10-154-12/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix code reuse issue in Projects::Clusters::ApplicationController#index See merge request gitlab-org/gitlab-ce!22182
| * | | | | | | | | Remove un-used inheritance from serviceThong Kuah2018-10-154-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the inheritance from ::BaseService which is causing us to inherit the initializer that has project as the first arg, as we will not have access to project with forthcoming group clusters. Also call install service from create service - 1 less thing to re-use Extract TestRequest code into a spec helper. Given that we need different behaviour for Rails 5.0 (and again in Rails 5.1!), it's handy to have that branching behaviour in one place
| * | | | | | | | | Move non-controller code into dedicated serviceThong Kuah2018-10-151-0/+63
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help with code re-use when we create applications for group level cluster next. Change `find_or_initialize_by` to explicitly find or build the right association based on the application name. The benefit here is that we use the associations on @cluster rather than querying from the other side of the association.
* | | | | | | | | Prioritize group settings, improve panel titles, disable submit without changesLuke Bennett2018-10-1511-12/+160
| | | | | | | | |
* | | | | | | | | Resolve "Personal projects pagination in Profile Overview tab is broken"Martin Wortschack2018-10-151-2/+29
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'Grzegorz Bizon2018-10-151-0/+25
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send deployment_status when job starts environment Closes #52614 See merge request gitlab-org/gitlab-ce!22354
| * | | | | | | Send deployment_status when job starts environmentSteve Azzopardi2018-10-151-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check was if the job `has_environment` which results into showing the environment information when the job stops the environment. This result into having a blank `deployment_status`. Use `starts_environment?` to be the same as the haml we have in 11.3 https://gitlab.com/gitlab-org/gitlab-ce/blob/30f019dca78bb64bcb8b355a267be006884e6d8f/app/views/projects/jobs/show.html.haml#L28
* | | | | | | | Merge branch 'improve-spec-for-gitlab-ci-status-pipeline-factory' into 'master'Grzegorz Bizon2018-10-151-19/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve spec for Gitlab::Ci::Status::Pipeline::Factory Closes #52280 See merge request gitlab-org/gitlab-ce!22247