summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clean up headers in markdowndocs-markdown-header-lintMarcel Amirault2019-07-1117-22/+33
| | | | | | | Some markdown headers needed tweaking to adhere to standards, including blank lines above and below, only one space after hash, first header should be h1, and only one h1 per doc
* Merge branch 'sh-bump-rspec-versions' into 'master'Mayra Cabrera2019-07-106-26/+29
|\ | | | | | | | | Upgrade rspec-rails to 3.8.2 and dependencies See merge request gitlab-org/gitlab-ce!28378
| * Upgrade rspec-rails to 3.8.2 and dependenciessh-bump-rspec-versionsDouglas Barbosa Alexandre2019-07-106-26/+29
| | | | | | | | | | | | | | | | This brings the rspec-core version in line with the Gitaly changes and introduces Rails 5.1/5.2 improvements. Full CHANGELOG: https://github.com/rspec/rspec-rails/blob/master/Changelog.md
* | Merge branch 'sl-stablise-basic-login-spec' into 'master'Dan Davison2019-07-106-17/+30
|\ \ | | | | | | | | | | | | | | | | | | Fix basic login test stability Closes gitlab-org/quality/staging#57 See merge request gitlab-org/gitlab-ce!30446
| * | Revert to using retry_untilsl-stablise-basic-login-specSanad Liaquat2019-07-093-4/+6
| | |
| * | Use retry on exceptionSanad Liaquat2019-07-092-4/+2
| | |
| * | Retry sign out if unsuccessfulSanad Liaquat2019-07-094-14/+27
| | | | | | | | | | | | Also extract retry_until into qa/qa/support/retrier.rb
* | | Merge branch 'jivanvl-support-additional-panel-types' into 'master'Fatih Acet2019-07-1017-75/+280
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support additional panel types Closes #60008 See merge request gitlab-org/gitlab-ce!30001
| * | | Add support for additional panel typesJose Ivan Vargas2019-07-1017-75/+280
|/ / / | | | | | | | | | | | | This introduces the single stat chart component aside from the area chart component
* | | Merge branch 'fix_simple_format_undefined' into 'master'Robert Speicher2019-07-102-5/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix `simple_format` undefined error #60179 Closes #60179 See merge request gitlab-org/gitlab-ce!30366
| * | | Extract plain file rendering into a separate methodVasiliy Yakliushin2019-07-071-3/+7
| | | |
| * | | Fix undefined method `simple_format for MarkupHelper:ModuleVasiliy Yakliushin2019-07-072-2/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `simple_format` is not defined in ActionView::Helpers::TagHelper, but it is actually located in ActionView::Helpers::TextHelper. The solution is to include the correct helper. I've also added tests for `#markup_unsafe` because they were missing.
* | | | Merge branch '54102-add-rubocop-for-rails-logger' into 'master'Stan Hu2019-07-10101-112/+233
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a Rubocop cop for Rails.logger Closes #54102 See merge request gitlab-org/gitlab-ce!30415
| * | | | Add a rubocop for Rails.loggerMayra Cabrera2019-07-10101-112/+233
|/ / / / | | | | | | | | | | | | | | | | | | | | Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
* | | | Merge branch 'docs-code-block-style-3' into 'master'Achilleas Pipinellis2019-07-1015-429/+434
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix whitespace in many administration docs (part 2) See merge request gitlab-org/gitlab-ce!30555
| * | | | Fix whitespace in many administration docsMarcel Amirault2019-07-1015-429/+434
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues for many admin docs (part 2)
* | | | Merge branch 'docs/edit-graphql' into 'master'Achilleas Pipinellis2019-07-102-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edit GraphQL general availability text See merge request gitlab-org/gitlab-ce!30541
| * | | | Edit GraphQL general availability textEvan Read2019-07-102-6/+7
|/ / / /
* | | | Merge branch 'docs-move-pgbouncer-ha-docs-out-of-db-docs' into 'master'Achilleas Pipinellis2019-07-102-83/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving Pgbouncer HA documentation out of database documentation Closes #63540 See merge request gitlab-org/gitlab-ce!30471
| * | | | Moving Pgbouncer HA documentation out of database documentationdocs-move-pgbouncer-ha-docs-out-of-db-docsabuerer2019-07-092-83/+83
| | | | |
* | | | | Merge branch ↵Stan Hu2019-07-104-12/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'backstage/gb/improve-performance-environment-statuses-endpoint' into 'master' Improve performance of fetching environments statuses Closes #62589 See merge request gitlab-org/gitlab-ce!30560
| * | | | | Add changelog for ci/cd environments Gitaly N+1 fixbackstage/gb/improve-performance-environment-statuses-endpointGrzegorz Bizon2019-07-101-0/+5
| | | | | |
| * | | | | Resolve Gitaly N+1 for CI/CD environments statusesGrzegorz Bizon2019-07-102-4/+3
| | | | | |
| * | | | | Add additional test case for Gitaly N+1 for diff filesGrzegorz Bizon2019-07-102-37/+70
| | | | | |
| * | | | | Add a test for `ci_environments_status` Gitaly N+1Grzegorz Bizon2019-07-101-16/+34
| | | | | |
* | | | | | Merge branch 'rf-optional-pipeline-for-vulnerabilities-api' into 'master'Douwe Maan2019-07-101-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vulnerabilities API now supports pipeline_id See merge request gitlab-org/gitlab-ce!30086
| * | | | | | Vulnerabilities API now supports pipeline_idrossfuhrman2019-07-101-0/+2
|/ / / / / /
* | | | | | Merge branch 'winh-notes-service-deleteNote' into 'master'Clement Ho2019-07-104-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deleteNote from notes service See merge request gitlab-org/gitlab-ce!30537
| * | | | | | Remove deleteNote from notes serviceWinnie Hellmann2019-07-104-15/+15
|/ / / / / /
* | | | | | Merge branch 'project-dashboards-docs' into 'master'Achilleas Pipinellis2019-07-101-1/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on project-based dashboard config See merge request gitlab-org/gitlab-ce!28154
| * | | | | | Add docs on project-based dashboard configSarah Yasonik2019-07-101-1/+64
|/ / / / / /
* | | | | | Merge branch '62363-follow-up-from-move-more-project-routes-under-scope' ↵Lin Jen-Shin2019-07-101-0/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add controller spec for deploy tokens Closes #62363 See merge request gitlab-org/gitlab-ce!30311
| * | | | | Add routing spec for deploy_tokens controllerDmitriy Zaporozhets2019-07-101-0/+6
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch '63044-cluster-health-group-refactor' into 'master'Douglas Barbosa Alexandre2019-07-1016-208/+235
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor common_metrics importer into a more extensible pattern Closes #63044 See merge request gitlab-org/gitlab-ce!30012
| * | | | | Remove unnecessary let in spec63044-cluster-health-group-refactorRyan Cobb2019-07-091-6/+3
| | | | | |
| * | | | | Remove unnecessary rubocop disableRyan Cobb2019-07-091-2/+0
| | | | | |
| * | | | | Rename Gitlab::Importers moduleRyan Cobb2019-07-0913-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid confusion between Gitlab::Importers module and other like named modules, this renamed it to Gitlab::DatabaseImporters.
| * | | | | Remove prepending of EE moduleRyan Cobb2019-07-091-2/+0
| | | | | |
| * | | | | Remove CommonMetricsImporter patchRyan Cobb2019-07-0912-53/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CommonMetricsImporter patch and change all references to CommonMetrics::Importer. Move specs into their appropriate folders. Also cleans up some common_metric importer namespacing.
| * | | | | Fully namespace importer dependenciesRyan Cobb2019-07-091-5/+5
| | | | | |
| * | | | | Remove prepending of EE moduleRyan Cobb2019-07-091-2/+0
| | | | | |
| * | | | | Move importers to lib folderRyan Cobb2019-07-0910-142/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves our metric importers into the lib folder. This will allow them to be autoloaded instead of having to explicitly require them.
| * | | | | Refactor common metrics importerRyan Cobb2019-07-098-172/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors common metrics importer for two reasons. 1. To create a new pattern that can be followed by future importers that will minimize dependency collision and 2. To allow EE to more easily extend dependencies.
* | | | | | Merge branch 'prepare-cycle-analytics-for-group-level' into 'master'Douglas Barbosa Alexandre2019-07-1030-95/+134
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare cycle analytics for group level See merge request gitlab-org/gitlab-ce!30356
| * | | | | | Add newline before subjectprepare-cycle-analytics-for-group-levelMałgorzata Ksionek2019-07-107-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop offences
| * | | | | | Add attribute reader to project levelMałgorzata Ksionek2019-07-101-4/+7
| | | | | | |
| * | | | | | Add attribute readerMałgorzata Ksionek2019-07-1012-22/+24
| | | | | | |
| * | | | | | Add guard clauseMałgorzata Ksionek2019-07-091-0/+2
| | | | | | |
| * | | | | | Add cr remarksMałgorzata Ksionek2019-07-0912-12/+12
| | | | | | |
| * | | | | | Add code review remarksMałgorzata Ksionek2019-07-094-14/+8
| | | | | | |
View Lorry Controller Status