summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Stop empty external auth classification labels overriding default labelsWill Chandler2019-09-061-0/+18
| | | | | | | | | | Most of the project templates bundled with GitLab have an empty string set for `external_authorization_classification_label` in their `project.json`. When imported this overrides the default label set on the instance, causing the label to appear empty. This change sets empty labels to nil during import, allowing the default label to override it and be applied to the project.
* Merge branch ↔Jan Provaznik2019-09-062-0/+35
|\ | | | | | | | | | | | | '59729-estimate-quick-action-does-not-produce-correct-time-for-1mo' into 'master' Resolve "estimate quick action does not produce correct time for 1mo" See merge request gitlab-org/gitlab-ce!32165
| * Fix time tracking parsing of months59729-estimate-quick-action-does-not-produce-correct-time-for-1moHeinrich Lee Yu2019-09-052-0/+35
| | | | | | | | | | Patches ChronicDuration to use our custom conversions when parsing months
* | Merge branch 'danger-review-pipeline' into 'master'RĂ©my Coutable2019-09-052-1/+17
|\ \ | | | | | | | | | | | | Add Danger Roulette rules for pipeline files See merge request gitlab-org/gitlab-ce!32616
| * | Add Danger Roulette rules for pipeline filesdanger-review-pipelineKyle Wiebers2019-09-052-1/+17
| | |
* | | New interruptible attribute supported in YAML parsing.CĂ©dric Tabin2019-09-052-0/+27
|/ / | | | | | | | | | | | | Since it is not possible to dynamically detect if a job is automatically cancellable or not, a this new attribute is necessary. Moreover, it let the maintainer of the repo to adjust the behaviour of the auto cancellation feature to match exactly what he needs.
* | Add structure to support EE feature of COARKerri Miller2019-09-052-3/+3
|/ | | | | | | These are the structural changes for supporting the EE feature of moving "code_owner_approval_required" state from existing on a project to being on the protected branches individually, allowing for CODEOWNER validation on push events.
* Remove feature flags starting with `prometheus_transaction_`Jacopo2019-09-052-6/+6
| | | | Those feature flags were always enabled so we can remove them safely.
* Merge branch ↔RĂ©my Coutable2019-09-055-28/+9
|\ | | | | | | | | | | | | | | | | '66966-convert-rails-env-stub-usages-to-use-railshelpers-stub_rails_env-instead' into 'master' Use stub_rails_env for Rails.env stubbing Closes #66966 See merge request gitlab-org/gitlab-ce!32625
| * Use stub_rails_env for Rails.env stubbing66966-convert-rails-env-stub-usages-to-use-railshelpers-stub_rails_env-insteadAsh McKenzie2019-09-055-28/+9
| | | | | | | | | | RailsHelpers.stub_rails_env takes care of stubbing Rails.env
* | Allow not resolvable urls when rebinding setting is disabledFrancisco Javier LĂłpez2019-09-051-42/+73
|/ | | | | Now, when the dns rebinging setting is disabled, we will allow urls that are not resolvable.
* Upgrade graphql gem to 1.9.10Brett Walker2019-09-042-2/+3
| | | | | | - `edge_nodes` needs to get called on the object - added `include GlobalID::Identification` in a couple places - renamed `object` to `item` in spec due to conflict
* Upgrade GraphQL gem to 1.8.17Brett Walker2019-09-044-11/+11
| | | | | | | | | - Due to https://github.com/exAspArk/batch-loader/pull/32, we changed BatchLoader.for into BatchLoader::GraphQL.for - since our results are wrapped in a BatchLoader::GraphQL, calling `sync` during authorization is required to get real object - `graphql` now has it's own authorization system. Our `authorized?` method conflicted and required renaming
* Backport EE changes for productivity analyticsPavel Shutsin2019-09-041-0/+69
| | | | Improve diff lines count efficiency
* Extract Workhorse <-> GitLab authentication to make it reusable61927-internal-api-jwt-authKrasimir Angelov2019-09-042-51/+93
| | | | | | | Introduce JWTAutheticatable module that can be reused for ai=uthtication between Pages and GitLab (the same way we use do now for Workhorse). Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927.
* Create an event on epic actionsJan Provaznik2019-09-032-0/+2
| | | | | Creates new event when an epic is created, closed, reopened or commented.
* Merge branch '13988-add-rails-helpers' into 'master'Stan Hu2019-09-031-3/+5
|\ | | | | | | | | | | | | Add new RailsHelpers module for specs Closes #66688 See merge request gitlab-org/gitlab-ce!32309
| * Use new RailsHelpers module13988-add-rails-helpersAsh McKenzie2019-08-281-3/+5
| |
* | Uses spec_helper instead of rails_helperMayra Cabrera2019-09-031-1/+1
| | | | | | | | | | spec/rails_helper.rb was removed on 1068ec2e9201af3de1fc5ebe9c8d9f7953c89b51
* | Merge branch '66741-remove-spec-rails_helper-rb' into 'master'Grzegorz Bizon2019-09-0328-28/+28
|\ \ | | | | | | | | | | | | | | | | | | Remove spec/rails_helper.rb Closes #66741 See merge request gitlab-org/gitlab-ce!32380
| * | Replace rails_helper.rb with spec_helper.rb66741-remove-spec-rails_helper-rbAsh McKenzie2019-08-3028-28/+28
| | | | | | | | | | | | | | | rails_helper.rb's only logic was to require spec_helper.rb.
* | | Added relationships between Release and MilestoneEtienne Baqué2019-09-031-0/+7
| | | | | | | | | | | | | | | | | | Modified schema via migrations. Added one-to-one relationship between the two models. Added changelog file
* | | Merge branch 'an-use-labkit-correlation-id' into 'master'Ash McKenzie2019-09-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove all references to Gitlab::CorrelationId See merge request gitlab-org/gitlab-ce!32228
| * | | Remove all references to Gitlab::CorrelationIdan-use-labkit-correlation-idAndrew Newdigate2019-08-261-1/+1
| | | | | | | | | | | | | | | | This class has been replaced with Labkit::Correlation::CorrelationId
* | | | If user can push to docker then it can delete tooGiorgenes Gelatti2019-09-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the permission of $CI_REGISTRY_USER to allow them to delete tags in addition to just pushing. https://gitlab.com/gitlab-org/gitlab-ce/issues/40096
* | | | Handle :9090 and 0.0.0.0:9090 listen_address formatsReuben Pereira2019-09-021-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090. But before these can be used to connect a project to Prometheus, they have to converted into absolute URIs.
* | | | Merge branch 'fix-peek-on-puma' into 'master'RĂ©my Coutable2019-09-022-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
| * | | | Make performance bar enabled checks consistentSean McGivern2019-08-282-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
* | | | | Merge branch 'sh-fix-ci-lint-500-error' into 'master'Ash McKenzie2019-09-021-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error in CI lint when included templates are an array Closes #66605 See merge request gitlab-org/gitlab-ce!32232
| * | | | | Fix 500 error in CI lint when included templates are an arraysh-fix-ci-lint-500-errorStan Hu2019-08-311-0/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the following syntax would fail in the linter with an error 500: ``` include: template: - License-Management.gitlab-ci.yml - Dependency-Scanning.gitlab-ci.yml - SAST.gitlab-ci.yml ``` Now the error will call out specifically that the value is not a string. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
* | | | | Merge branch '46686-move-k8s-services-out-of-gcp-namespace' into 'master'66783-usage-ping-for-slack-integrationsThong Kuah2019-09-011-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move generic k8s services out of GCP namespace See merge request gitlab-org/gitlab-ce!32310
| * | | | | Move generic k8s services out of GCP namespace46686-move-k8s-services-out-of-gcp-namespaceTiger2019-08-281-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | These services aren't specific to GCP, and will be used for AWS as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/46686
* | | | | Merge branch 'improve-chatops-help' into 'master'Nick Thomas2019-09-013-6/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve chatops help output See merge request gitlab-org/gitlab-ce!32208
| * | | | | Improve chatops help outputimprove-chatops-helpYorick Peterse2019-08-293-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the output produced when running an unknown command, running the "help" command, and when trying to run a command you are not allowed to run. The new help output includes links to the project of the chatops integration, and a link to the chatops documentation.
* | | | | | Fix for histogram corruption in SidekiqAndrew Newdigate2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in which sidekiq histograms contain invalid labels. See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7729 for more details.
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-295-21/+212
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-enable-image-proxy' into 'master'GitLab Release Tools Bot2019-08-291-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use image proxy to mitigate stealing ip addresses Closes #2812 See merge request gitlab/gitlabhq!2926
| | * | | | | | Fix failing spec due to changes UpdateServiceBrett Walker2019-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for ApplicationSettings
| * | | | | | | Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-291-2/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add direct upload support for personal snippets See merge request gitlab/gitlabhq!3226
| | * | | | | | | Add direct upload support for personal snippetsJan Provaznik2019-08-231-2/+16
| | | | | | | | |
| * | | | | | | | Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-291-0/+78
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require a captcha after unique failed logins from the same IP See merge request gitlab/gitlabhq!3270
| | * | | | | | | | Add captcha if there are multiple failed login attemptsMaƂgorzata Ksionek2019-07-311-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method to store session ids by ip Add new specs for storing session ids Add cleaning up records after login Add retrieving anonymous sessions Add login recaptcha setting Add new setting to sessions controller Add conditions for showing captcha Add sessions controller specs Add admin settings specs for login protection Add new settings to api Add stub to devise spec Add new translation key Add cr remarks Rename class call Add cr remarks Change if-clause for consistency Add cr remarks Add code review remarks Refactor AnonymousSession class Add changelog entry Move AnonymousSession class to lib Move store unauthenticated sessions to sessions controller Move link to recaptcha info Regenerate text file Improve copy on the spam page Change action filter for storing anonymous sessions Fix rubocop offences Add code review remarks
| * | | | | | | | | Merge branch 'security-project-import-bypass' into 'master'GitLab Release Tools Bot2019-08-291-0/+82
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project visibility restriction bypass See merge request gitlab/gitlabhq!3306
| | * | | | | | | | | Fix project import restricted visibility bypassGeorge Koltsov2019-08-151-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::VisibilityLevelChecker that verifies selected project visibility level (or overridden param) is not restricted when creating or importing a project
| * | | | | | | | | | Merge branch 'security-ssrf-kubernetes-dns-12-3' into 'master'GitLab Release Tools Bot2019-08-291-18/+35
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DNS Rebind SSRF in Kubernetes Integration See merge request gitlab/gitlabhq!3345
| | * | | | | | | | | | Override hostname when connecting via KubeclientThong Kuah2019-08-211-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubeclient uses rest-client. We hack into to access the net/http object so that we can patch to connect to the resolved IP + set hostname_override. Add specs for discord. The discord integration also uses rest-client, so since we patched rest-client, spec that the DNS rebinding protection works
* | | | | | | | | | | | Add a close issue slack slash commandSarah Yasonik2019-08-292-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a slash command in slach for closing issues. See https://docs.gitlab.com/ee/integration/slash_commands.html for documentation on the wider feature set.
* | | | | | | | | | | | Revert "Cache branch and tag names as Redis sets"Nick Thomas2019-08-292-80/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0eff75fa2b6691b6fba31fcc2842f51debd249a9.
* | | | | | | | | | | | Allow project feature permissions to be overridden during importGeorge Koltsov2019-08-291-0/+21
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'local-test-failures' into 'master'Robert Speicher2019-08-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-user-related local test failures See merge request gitlab-org/gitlab-ce!31437