summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-191-1/+1
|\ | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | Merge branch 'ac-review-app-changes-33418' into 'master'Nick Thomas2018-10-191-0/+2
|\ \ | | | | | | | | | | | | Expose changed URLs in MR ci_environments_status See merge request gitlab-org/gitlab-ce!22228
| * | Move ci_environments_status to a modelAlessio Caiazza2018-10-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | GET :namespace/merge_requests/:id/ci_environments_status complexity already reached a limit for a direct serialization from an hash computed at within the controller function. Here we introduce a virtual model EnvironmentStatus and its serializer.
* | | Merge branch 'sh-strip-github-pat-whitespace' into 'master'Rémy Coutable2018-10-181-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Strip whitespace around GitHub personal access tokens Closes #46588 See merge request gitlab-org/gitlab-ce!22432
| * | | Strip whitespace around GitHub personal access tokensStan Hu2018-10-171-0/+12
| |/ / | | | | | | | | | | | | | | | | | | Some browsers insert a trailing whitespace after pasting the token into the field. This should help reduce confusion. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46588
* | | Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-171-0/+13
| | |
* | | 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
* | | Show available clusters when installed or updatedPeter Leitzen2018-10-162-56/+83
|/ / | | | | | | | | Before this commit updating Prometheus (e.g. adding alerts) made it "updated" therefore not installed.
* | 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-151-0/+11
|\ \ | | | | | | | | | | | | | | | | | | '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-151-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | 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
* | Prioritize group settings, improve panel titles, disable submit without changesLuke Bennett2018-10-151-0/+24
|/
* Remove Git circuit breakerZeger-Jan van de Weg2018-10-101-19/+0
| | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* Merge branch 'load_project_features' into 'master'Sean McGivern2018-10-051-1/+5
|\ | | | | | | | | | | | | Preload project features in reference parser Closes #43094 See merge request gitlab-org/gitlab-ce!22008
| * Preload project features in reference parserJan Provaznik2018-09-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | Preloading of project_features mitigates N+1 queries when checking references in other projects. When loading projects for resources referenced in comments it makes sense to include also associated project_features because in the following step (`can_read_reference?(user, projects[node], node)`) project features is used for checking permissions for the given project.
* | Merge branch '51009-remove-rbac-clusters-feature-flag' into 'master'Kamil Trzciński2018-10-041-4/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove :rbac_clusters feature flag Closes #51009 See merge request gitlab-org/gitlab-ce!22096
| * | Remove `rbac_clusters` feature flagThong Kuah2018-10-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Auto DevOps can run in a RBAC enabled cluster from https://gitlab.com/gitlab-org/gitlab-ce/issues/51942, we can now remove the FF. As the flag only governed if UI elements would appear or not when creating/adding existing clusters; the effect of removing the FF would be that the checkbox to choose to enable RBAC clusters will now always appear. Remove FF stubs from specs Improve spec context names
* | | Backport of "Use Geo log to remove files when migrated to object storage"Toon Claes2018-10-031-0/+8
|/ /
* | Merge branch 'remove-rugged' into 'master'Douwe Maan2018-10-032-7/+12
|\ \ | | | | | | | | | | | | Remove Gitlab::Git::Repository#rugged See merge request gitlab-org/gitlab-ce!22039
| * | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-022-7/+12
| |/ | | | | | | | | | | | | | | Cleanup code, and refactor tests that still use Rugged. After this, there should be no Rugged code that access the instance's repositories on non-test environments. There is still some rugged code for other tasks like the repository import task, but since it doesn't access any repository storage path it can stay.
* | Show the commit-sha for pre-release versionsBob Van Landuyt2018-10-021-0/+8
|/ | | | | | | | | The pre-release tags are set at the beginning of a release, so it would be impossible to figure out which version was running if we're running nightlies. In that case it's better to still link to the SHA. These versions don't get deployed to .com.
* Merge branch 'ce-7013-add-epics-close-support' into 'master'Douglas Barbosa Alexandre2018-09-251-0/+4
|\ | | | | | | | | CE port of Adding state to epics See merge request gitlab-org/gitlab-ce!21771
| * Add name definition for table methodJarka Košanová2018-09-241-0/+4
| |
* | Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-191-0/+47
| |
* | Merge branch 'rs-markdown-feature-parity' into 'master'Douglas Barbosa Alexandre2018-09-171-1/+7
|\ \ | |/ |/| | | | | Add fixture path argument to `MarkdownFeature.new` See merge request gitlab-org/gitlab-ce!21754
| * Add fixture path argument to `MarkdownFeature.new`Robert Speicher2018-09-141-1/+7
| | | | | | | | | | This default will be overridden in the EE-specific subclass that uses a different fixture path.
* | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-171-2/+2
| |
* | Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński2018-09-172-18/+44
|\ \ | |/ |/| | | | | | | | | Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
| * Kubernetes secret are namespaced, so must always pass a namespace arg.Thong Kuah2018-09-141-4/+4
| | | | | | | | In our case it's 'default'.
| * Address BE review - re-arrange some specsThong Kuah2018-09-141-1/+2
| |
| * Add FE option for users to choose to create a fully RBAC-enabled cluster or not.Thong Kuah2018-09-141-11/+2
| | | | | | | | This is similar to the option in the Add Existing cluster form
| * Always create `gitlab` service account and service account token regardless ↵Thong Kuah2018-09-141-17/+25
| | | | | | | | | | | | | | | | | | | | | | of ABAC/RBAC This also solves the async nature of the automatic creation of default service tokens for service accounts. It also makes explicit which service account token we always use. create cluster role binding only if the provider has legacy_abac disabled.
| * Create a GKE cluster with legacy_abac disabled when the `:rbac_clusters` ↵Thong Kuah2018-09-141-1/+15
| | | | | | | | | | | | feature flag is enabled Explicitly persist the legacy_abac value of the cluster_provider_gcp so that we can disable abac if the `:rbac_clusters` feature flag is enabled
| * When provisioning a new cluster, create gitlab service account so that ↵Thong Kuah2018-09-141-0/+12
| | | | | | | | | | | | | | GitLab can perform operations in a RBAC-enabled cluster. Correspondingly, use the token of the gitlab service account, vs the default service account token which will have no privs.
* | Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-141-0/+3
|\ \ | |/ |/| | | | | CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
| * Properly implement prepending for ConcernLin Jen-Shin2018-09-111-0/+3
| |
* | Merge branch 'clean-gitlab-git' into 'master'Douwe Maan2018-09-122-4/+11
|\ \ | | | | | | | | | | | | | | | | | | Remove Rugged and shell code from Gitlab::Git Closes gitaly#1124 See merge request gitlab-org/gitlab-ce!21488
| * | Remove Rugged and shell code from Gitlab::GitAlejandro Rodríguez2018-09-122-4/+11
| |/
* | Fix mention in edit mrAlin Ciciu2018-09-121-2/+6
|/
* Merge branch 'lock-unlock-quick-actions' into 'master'Rémy Coutable2018-09-101-5/+79
|\ | | | | | | | | | | | | Add /lock and /unlock quick actions Closes #39173 See merge request gitlab-org/gitlab-ce!15197
| * Prefer `sign_in` over `gitlab_sign_in` as its fasterMehdi Lahmam2018-09-061-2/+2
| | | | | | | | | | | | Devise helpers acts on Warden which is faster than our own helpers. Note that `gitlab_sign_out` is still necessary due to the same issue mentioned at 60814985e033e4941ff3eb5d33ca55e3fc81593e
| * Use un-namespaced project issuables path helper in specsMehdi Lahmam2018-09-061-7/+7
| |
| * Rename `slash_commands` ~> `quick_actions` in specs filesMehdi Lahmam2018-09-061-0/+0
| | | | | | | | Leftover from ea090291.
| * Add /lock and /unlock quick actionsMehdi Lahmam2018-09-061-0/+74
| | | | | | | | Closes #39173
* | Merge branch 'sidekiq-query' into 'master'Rémy Coutable2018-09-101-0/+20
|\ \ | | | | | | | | | | | | Disable query limit counter in sidekiq See merge request gitlab-org/gitlab-ce!21470
| * | Disable query limit counter in sidekiqJan Provaznik2018-09-041-0/+20
| | | | | | | | | | | | | | | Inside Sidekiq the request is whitelisted to avoid increasing query counter.
* | | Explicitly enable usage ping for instance statistics specStan Hu2018-09-091-0/+2
| | | | | | | | | | | | | | | This is similar to https://gitlab.com/gitlab-org/gitlab-ee/issues/7511, but the root cause is https://gitlab.com/gitlab-org/gitlab-ce/issues/51268.
* | | Sort labels by referenceJan Provaznik2018-09-071-2/+2
| | | | | | | | | | | | | | | Labels are sorted by reference, not title. This caused random CI failure.