summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Create models for issue trackers data58886-issue-tracker-fieldsJarka Košanová2019-06-131-0/+2
| | | | | - create tables for storing issue trackers properties - add model and basic logic & spec
* Merge branch '33064-add-labels-to-note-event-payload' into 'master'Sean McGivern2019-06-101-0/+2
|\ | | | | | | | | | | | | Adding labels to note event payload. Closes #33064 See merge request gitlab-org/gitlab-ce!29384
| * Adding labels to note event payload.Sujay Patel2019-06-101-0/+2
| |
* | Revert "Merge branch '50070-legacy-attachments' into 'master'"sh-revert-mr-24679Stan Hu2019-06-091-253/+0
| | | | | | | | | | This reverts commit fd19f887dfeeeedb483c4a4fb32f9f768e89389c, reversing changes made to abb2d4c601d796339c8d7cb0c00946696730f198.
* | Fix migration specs using factoriesMarkus Koller2019-06-071-9/+25
| | | | | | | | | | | | | | | | | | | | We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced. The `let!` calls were executed before the `before` hook which still caused some factories to fail, so they're created in the `before` hook now as well.
* | Merge branch '62418-project-default-git-depth' into 'master'Kamil Trzciński2019-06-072-0/+9
|\ \ | | | | | | | | | | | | | | | | | | Add project level git depth setting Closes #59688 See merge request gitlab-org/gitlab-ce!28919
| * | Fix migration specs using factoriesKrasimir Angelov2019-06-072-2/+2
| | | | | | | | | | | | | | | | | | We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced.
| * | Add project level git depth settingKrasimir Angelov2019-06-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce default_git_depth in project's CI/CD settings and set it to 50. Use it if there is no GIT_DEPTH variable specified. Apply this default only to newly created projects and keep it nil for old ones in order to not break pipelines that rely on non-shallow clones. default_git_depth can be updated from CI/CD Settings in the UI, must be either nil or integer between 0 and 1000 (incl). Inherit default_git_depth from the origin project when forking projects. MR pipelines are run on a MR ref (refs/merge-requests/:iid/merge) and it contains unique commit (i.e. merge commit) which doesn't exist in the other branch/tags refs. We need to add it cause otherwise it may break pipelines for old projects that have already enabled Pipelines for merge results and have git depth 0. Document new default_git_depth project CI/CD setting
* | | Merge branch '50070-legacy-attachments' into 'master'Kamil Trzciński2019-06-071-0/+237
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate legacy uploads Closes #57217 See merge request gitlab-org/gitlab-ce!24679
| * | | Migrate legacy uploads to the project location50070-legacy-attachmentsJarka Košanová2019-06-061-0/+237
| | | | | | | | | | | | | | | | | | | | | | | | Uploads coming from AttachmentUploader need to be moved to the currently supported location (FileUploader)
* | | | Make OpenID Connect work without requiring a namesh-fix-openid-connect-defaultsStan Hu2019-06-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no name argument given, OmniAuth will try to guess the name by the class name. In https://github.com/omniauth/omniauth/blob/v1.9.0/lib/omniauth/strategy.rb#L139, `OmniAuth::Strategies::OpenIDConnect` gets translated to `openidconnect`. This leads to an immediate 404 error after clicking the login button because OmniAuth can't match the current route (/users/auth/openid_connect) against the expected one (/users/auth/openidconnect). Other providers, such as Google OAuth2, set this name as the default option within the OmniAuth Strategy. Until a fix is merged upstream, let's just set the parameter ourselves. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62208
* | | | Add pages domains acme ordersVladimir Shushlin2019-06-062-33/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract acme double to helper Create ACME challanges for pages domains * Create order & challange through API * save them to database * request challenge validation We're saving order and challenge as one entity, that wouldn't be correct if we would order certificates for several domains simultaneously, but we always order certificate per domain Add controller for processing acme challenges redirected from pages Don't save acme challenge url - we don't use it Validate acme challenge attributes Encrypt private_key in acme orders
* | | | Merge branch ↵Dmitriy Zaporozhets2019-06-061-15/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62847-url-for-the-next-request-with-pagination-is-missing-port' into 'master' Resolve "Url for the next request with pagination is missing port" Closes #62847 See merge request gitlab-org/gitlab-ce!29267
| * | | | Include the port in the URLs of the API Link headersRémy Coutable2019-06-061-15/+19
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '62015-add-counterpart-tae-to-the-reviewer-roulette' into 'master'Sean McGivern2019-06-061-10/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add counterpart TAE to the reviewer roulette" Closes #62015 See merge request gitlab-org/gitlab-ce!28678
| * | | | Show Test Automation Engineer for spec/feature asLin Jen-Shin2019-06-061-10/+37
| |/ / / | | | | | | | | | | | | reviewers.
* | | | Merge branch 'fix/allow-lower-case-issue-ids' into 'master'Sean McGivern2019-06-061-0/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Allow lowercase prefix for Youtrack issue ids Closes #62661 See merge request gitlab-org/gitlab-ce!29057
| * | | Allow lowercase prefix for Youtrack issue idsMatthias Baur2019-06-031-0/+7
| | | | | | | | | | | | | | | | | | | | Relates to #42595. Fixes #62661.
* | | | Ensure that template is used onceKamil Trzciński2019-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This adds additional test that make sure that each template name is used exactly once across all folders exposed
* | | | Merge branch 'ci-variable-expression-con-dis-junction' into 'master'Kamil Trzciński2019-06-0610-208/+730
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CI variable expression conjunction/disjunction See merge request gitlab-org/gitlab-ce!27925
| * | | | && and || operators for CI Pipeline expressions.drew cimino2019-06-0410-208/+730
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored regex pattern matching to eagerly return tokens Packaged behind a default-enabled feature flag and added operator documentation.
* | | | | Merge branch 'revert-86900f00' into 'master'Grzegorz Bizon2019-06-061-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Revert "Disable retrying cancelled jobs" Closes #62350 See merge request gitlab-org/gitlab-ce!29201
| * | | | Revert "Merge branch..."revert-86900f00Kamil Trzciński2019-06-051-4/+4
| | | | | | | | | | | | | | | This reverts merge request !27503
* | | | | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-057-12/+372
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
| * | | | | Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-052-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | It's not needed anymore as we require `#cache_key` instead.
| * | | | | Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-053-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also includes some changes in specs to use `Class.new` approach.
| * | | | | Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-057-12/+370
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* | | | | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-051-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
| * | | | | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-051-0/+20
| |/ / / /
* | | | | Merge branch '11126-fix-repository-size-check-ce' into 'master'Stan Hu2019-06-052-0/+23
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Add client code to call GetObjectDirectorySize RPC See merge request gitlab-org/gitlab-ce!28918
| * | | | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-cePatrick Bajao2019-06-052-0/+23
| |/ / / | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
* | | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-051-0/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix connection to Tiller error while uninstalling Closes #62713 See merge request gitlab-org/gitlab-ce!29131
| * | | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the `install-<app>` and `uninstall-<app>` pods loads the `values-content-configuration-<app>` configmap into the pod (see `#volume_specification`). This configmap contains the cert necessary to connect to Tiller. The cert though is only valid for 30 minutes. So this fixes the bug where the configmap when uninstalling should be updated as well.
* | | | | Add multiple extends supportWolphin2019-06-053-11/+39
| |/ / / |/| | |
* | | | Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-043-8/+71
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Adds ruby and unicorn instrumentation Closes #61964 See merge request gitlab-org/gitlab-ce!28499
| * | | Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-2912-83/+313
| |\ \ \
| * | | | Adds ruby and unicorn instrumentationRyan Cobb2019-05-203-8/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds ruby and unicorn instrumentation. This was originally intended in 11.11 but due to performance concerns it was reverted. This new commit foregoes the sys-proctable gem was causing performance issues previously.
* | | | | Ignore Puma empty worker statsJan Provaznik2019-06-041-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases (during worker start) it's possible that Puma.stats returns an empty hash for worker's last status. In that case we just skip sampling of the worker until these stats are available.
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-034-1/+71
|\ \ \ \ \
| * \ \ \ \ Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-031-0/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject slug+uri concat if slug is deemed unsafe See merge request gitlab/gitlabhq!3108
| | * | | | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-241-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First reported: https://gitlab.com/gitlab-org/gitlab-ce/issues/60143 When the page slug is "javascript:" and we attempt to link to a relative path (using `.` or `..`) the code will concatenate the slug and the uri. This MR adds a guard to that concat step that will return `nil` if the incoming slug matches against any of the "unsafe" slug regexes; currently this is only for the slug "javascript:" but can be extended if needed. Manually tested against a non-exhaustive list from OWASP of common javascript XSS exploits that have to to with mangling the "javascript:" method, and all are caught by this change or by existing code that ingests the user-specified slug.
| * | | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-033-1/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistent XSS in note objects CE See merge request gitlab/gitlabhq!3075
| | * | | | | | Remove unused fixture linesTiger2019-05-281-2/+0
| | | | | | | |
| | * | | | | | Add `html` to sensitive wordscharlieablett2019-05-011-1/+2
| | | | | | | |
| | * | | | | | Remove accidental regressionscharlieablett2019-04-301-5/+6
| | | | | | | |
| | * | | | | | Ensure Issue & MR note_html cannot be importedAsh McKenzie2019-04-302-16/+16
| | | | | | | |
| | * | | | | | Add disallowed fields to AttributeCleanercharlieablett2019-04-242-10/+8
| | | | | | | |
| | * | | | | | Re-stub stubbed method callscharlieablett2019-04-231-3/+9
| | | | | | | |
| | * | | | | | Exclude fields from note importcharlieablett2019-04-232-2/+26
| | | | | | | |
* | | | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-0316-64/+438
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |