summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Pull files for repository tree from GraphQL APIPhil Hughes2019-05-244-17/+56
|
* Merge branch 'fix-milestone-references-with-escaped-html-entities' into 'master'Jan Provaznik2019-05-241-0/+21
|\ | | | | | | | | | | | | Fix milestone references with HTML entities in the name Closes #62114 See merge request gitlab-org/gitlab-ce!28667
| * Fix milestone references with HTML entities in the namefix-milestone-references-with-escaped-html-entitiesSean McGivern2019-05-241-0/+21
| | | | | | | | | | | | | | | | | | When a milestone name contained an HTML entity that would be escaped (&, <, >), then it wasn't possible to refer to this milestone by name, or use it in a quick action. This already worked for labels, but not for milestones. We take care to re-escape un-matched milestones, too.
* | Merge branch '56959-remove-auto-devops-domain-ci-variable' into 'master'Stan Hu2019-05-245-197/+6
|\ \ | | | | | | | | | | | | Drop support for AUTO_DEVOPS_DOMAIN See merge request gitlab-org/gitlab-ce!28460
| * | Remove un-used methodsThong Kuah2019-05-241-28/+0
| | | | | | | | | | | | | | | These two methods were used in emitting AUTO_DEVOPS_DOMAIN which has now been dropped.
| * | Stop emitting AUTO_DEVOPS_DOMAIN Ci variableThong Kuah2019-05-245-169/+6
| | | | | | | | | | | | Update documentation to reflect removal
* | | Changes RackAttack logger to use structured logsMayra Cabrera2019-05-241-0/+22
|/ / | | | | | | | | | | | | | | Creates a new filename to register auth logs. This change should allow SRE's queries to make better queries through logging infrastructure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54528
* | Fix OmniAuth OAuth2Generic strategy not loadingStan Hu2019-05-231-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/commit/83b767ce, Rails 5.1 removed support for using a String to specify a middleware. When the strategy_class argument is passed from the GitLab YAML config to Devise, Devise passes the string value straight through to Rails, and GitLab would crash with a NoMethodError inside ActionDispatch::MiddlewareStack. To make this OmniAuth strategy work again, we normalize the arguments by converting the strategy_class value into an actual Class. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62216
* | Merge branch 'api_masked_variables' into 'master'Bob Van Landuyt2019-05-231-1/+4
|\ \ | |/ |/| | | | | | | | | API: Allow to get and set "masked" attribute for variables Closes #61754 See merge request gitlab-org/gitlab-ce!28381
| * API: Allow to get and set "masked" attribute for variablesMathieu Parent2019-05-221-1/+4
| |
* | Fix issue importing members with owner accessJames Lopez2019-05-231-0/+7
| |
* | Change system notes to use relative urlsLuke Picciau2019-05-231-2/+2
| |
* | Merge branch '60250-remove-mr_push_options-flag' into 'master'Stan Hu2019-05-221-12/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove the mr_push_options feature flag Closes #60250 See merge request gitlab-org/gitlab-ce!28278
| * | Remove the mr_push_options feature flagLuke Duncalfe2019-05-171-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | `Gitlab::QueryLimiting.whitelist` has been moved from being inside the feature flag conditional check to the `process_mr_push_options` `Api::Internal` helper. https://gitlab.com/gitlab-org/gitlab-ce/issues/60250
* | | Merge branch 'sh-project-import-visibility-error' into 'master'Douglas Barbosa Alexandre2019-05-221-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid visibility string comparison in project import Closes #61692 See merge request gitlab-org/gitlab-ce!28612
| * | | Fix invalid visibility string comparison in project importStan Hu2019-05-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves an "ArgumentError: comparison of String with 0 failed" issue where the visibility_level is stored as a string in the project import data because the value comes directly from the Web form. This problem happened upon creating a project from a template or restoring a project. We now cast the value to an integer to guard against these kinds of failures. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61692
* | | | Merge branch ↵Douglas Barbosa Alexandre2019-05-221-0/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents' into 'master' Resolve "Performance issue: 502 errors on rendering of issues with heavy markdown contents" Closes #62116 See merge request gitlab-org/gitlab-ce!28597
| * | | Fix page_description helper performance62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contentsSean McGivern2019-05-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper is used for extracting part of the issue / MR / whatever description for use in the description meta tag: 1. To do that, we look at the source of the Markdown description. 2. We then strip out all HTML tags. 3. And then take the first 30 words. Doing that can be really slow - especially as Markdown is supposed to be treated as plain text. There are many better ways to do this, but the immediate performance fix is to swap steps 2 and 3. This does mean that the description may be less than 30 words (or even empty), but it is much faster when the description is very long.
* | | | Merge branch 'link-to-issue-in-code-reuse-active-record-rubocop-rule' into ↵Yorick Peterse2019-05-221-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Link to issue in CodeReuse/ActiveRecord message See merge request gitlab-org/gitlab-ce!28461
| * | | | Link to issue in CodeReuse/ActiveRecord messagelink-to-issue-in-code-reuse-active-record-rubocop-ruleLuke Duncalfe2019-05-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This provides the user with some context as to why certain ActiveRecord methods are blacklisted.
* | | | | Merge branch 'graphql-tree' into 'master'Nick Thomas2019-05-2210-0/+205
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Added repository files to GraphQL API See merge request gitlab-org/gitlab-ce!28325
| * | | | Added repository files to GraphQL APIPhil Hughes2019-05-2210-0/+205
| | | | |
* | | | | Merge branch 'sh-bump-shoulda-matcher' into 'master'Jan Provaznik2019-05-225-30/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump shoulda-matchers to 4.0.1 See merge request gitlab-org/gitlab-ce!28443
| * | | | | Fix remaining failures in shoulda-matcherStan Hu2019-05-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Rails 5, belongs_to now adds a presence validation to the association, and so as of shoulda-matchers 4.0.0 the belong_to matcher follows suit and tests that this validation is there by setting the association to nil and asserting that there are validation errors. This exposed an error with the `validate_branches` method: we need to check the source and target project exist.
| * | | | | Ensure subject passes validationsStan Hu2019-05-212-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5 requires that belongs_to associations have the associated record present. These tests were failing because they had nil values.
| * | | | | Bump shoulda-matchers to 4.0.1Stan Hu2019-05-211-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the warning when using Ruby 2.6: BigDecimal.new is deprecated; use BigDecimal() method instead. This also adds Rails 5 support, which eliminates the need for the monkey patch to handle https://github.com/thoughtbot/shoulda-matchers/issues/913.
* | | | | | Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"revert-04c3c6ddKamil Trzciński2019-05-227-109/+1
| | | | | | | | | | | | | | | | | | This reverts merge request !27514
* | | | | | Merge branch ↵Nick Thomas2019-05-229-38/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61935-remove-code-left-over-from-when-clusters-were-always-project-specific' into 'master' remove `Clusters::Platforms::Kubernetes#actual_namespace` Closes #61935 See merge request gitlab-org/gitlab-ce!28391
| * | | | | | Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specificTiger2019-05-219-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Kubernetes clusters were originally built they could only exist at the project level, and so there was logic included that assumed there would only ever be a single Kubernetes namespace per cluster. We now support clusters at the group and instance level, which allows multiple namespaces. This change consolidates various project-specific fallbacks to generate namespaces, and hands all responsibility to the Clusters::KubernetesNamespace model. There is now no concept of a single namespace for a Clusters::Platforms::Kubernetes; to retrieve a namespace a project must now be supplied in all cases. This simplifies upcoming work to use a separate Kubernetes namespace per project environment (instead of a namespace per project).
* | | | | | | Merge branch 'jc-git-deduplication-service' into 'master'Nick Thomas2019-05-221-0/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitDeduplicationService Closes #60871 See merge request gitlab-org/gitlab-ce!28144
| * | | | | | | Add GitDeduplicationService for deduplication housekeepingjc-git-deduplication-serviceJohn Cai2019-05-211-0/+90
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | GitDeduplicationService performs idempotent operations on deduplicated projects.
* | | | | | | Merge branch 'reorganize-tests-jobs-by-level' into 'master'Kamil Trzciński2019-05-227-1/+109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize test jobs by level See merge request gitlab-org/gitlab-ce!27514
| * | | | | | | Reorganize test jobs by levelreorganize-tests-jobs-by-levelRémy Coutable2019-05-207-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'repo-list-row-component' into 'master'Filipa Lacerda2019-05-223-0/+141
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tree list row component See merge request gitlab-org/gitlab-ce!28542
| * | | | | | | | Added tree list row componentPhil Hughes2019-05-213-0/+141
| | | | | | | | |
* | | | | | | | | Merge branch ↵Ash McKenzie2019-05-221-76/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo' into 'master' Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation Closes gitlab-ee#8723 See merge request gitlab-org/gitlab-ce!28546
| * | | | | | | | | Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementationValery Sizov2019-05-221-76/+22
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | We kept it for smooth update only
* | | | | | | | | #61441 Allow user to set email ID before setting up 2FAKartikey Tanna2019-05-221-3/+18
| | | | | | | | |
* | | | | | | | | Merge branch 'api-spec-scb' into 'master'Phil Hughes2019-05-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in api_spec Closes gitlab-ee#6611 See merge request gitlab-org/gitlab-ce!28576
| * | | | | | | | Resolve CE/EE diffs in api_specLuke Bennett2019-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | Merge branch 'sh-fix-linter-registry-haml-try2' into 'master'Ash McKenzie2019-05-221-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized constant with HamlLint::LinterRegistry Closes #62125 See merge request gitlab-org/gitlab-ce!28578
| * | | | | | | | Move files from lib/haml_lint to haml_lintsh-fix-linter-registry-hamlStan Hu2019-05-211-0/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files in lib will be eager loaded and hence will require haml_lint to be loaded. Since this is only a development dependency, we can't assume this gem will be available in production, so it should never be loaded in production.
* | | | | | | | Merge branch 'dz-scope-project-routes' into 'master'Stan Hu2019-05-225-24/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Move some project routes under /-/ scope See merge request gitlab-org/gitlab-ce!28435
| * | | | | | | Add network and graphs to legacy routes toodz-scope-project-routesDmitriy Zaporozhets2019-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add legacy routes for modified project pathDmitriy Zaporozhets2019-05-212-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For settings, branches and tags Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix specs to match route changesDmitriy Zaporozhets2019-05-204-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'mc/bug/pipeline-cache-invalid' into 'master'Kamil Trzciński2019-05-211-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire pipeline cache on job update Closes #48024 See merge request gitlab-org/gitlab-ce!28432
| * | | | | | | | Expire pipeline cache on finishmc/bug/pipeline-cache-invalidMatija Čupić2019-05-211-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'bw-remove-constant-warnings' into 'master'Mayra Cabrera2019-05-211-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'already initialized constant' warnings See merge request gitlab-org/gitlab-ce!28518
| * | | | | | | | Remove 'already initialized constant' warningsbw-remove-constant-warningsBrett Walker2019-05-201-1/+2
| |/ / / / / / /