summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add helpers to wait for axios requestsmh/wait-for-requestsMartin Hanzel2019-09-054-14/+113
| | | | | | | | | Add two methods to the axios_utils Jest mock: - `waitFor(url)`, which returns a Promise that resolves when the next request to `url` finishes. - `waitForAll()`, which returns a Promise that resolves when all pending requests finish.
* Merge branch 'fj-remove-dns-protection-when-validating' into 'master'Thong Kuah2019-09-053-1/+49
|\ | | | | | | | | | | | | Avoid checking dns rebind protection in validation Closes #66723 See merge request gitlab-org/gitlab-ce!32577
| * Avoid checking dns rebind protection in validationFrancisco Javier López2019-09-053-1/+49
|/
* Merge branch 'docs-serveo-link' into 'master'Achilleas Pipinellis2019-09-051-2/+4
|\ | | | | | | | | Change serveo link as it often goes down See merge request gitlab-org/gitlab-ce!32680
| * Change serveo link as it often goes downMarcel Amirault2019-09-051-2/+4
|/
* Merge branch 'docs/add-global-nav-principles' into 'master'Achilleas Pipinellis2019-09-052-22/+73
|\ | | | | | | | | Provide guidance on how docs global navigation should be structured See merge request gitlab-org/gitlab-ce!32624
| * Provide guidance on how docs global navigation should be structuredEvan Read2019-09-052-22/+73
|/
* Merge branch 'remove-unnecessary-freeze-in-lib-gitlab' into 'master'Jan Provaznik2019-09-0561-117/+119
|\ | | | | | | | | Avoid calling freeze on already frozen strings in lib/gitlab See merge request gitlab-org/gitlab-ce!32637
| * Avoid calling freeze on already frozen strings in lib/gitlabdineshpanda2019-09-0461-117/+119
| |
* | Merge branch ↵Rémy Coutable2019-09-0515-45/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '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-0515-45/+25
| | | | | | | | | | | | | | | RailsHelpers.stub_rails_env takes care of stubbing Rails.env
* | | Merge branch 'shorten-doc-pipeline' into 'master'Rémy Coutable2019-09-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Add docs exception to lint-ci job See merge request gitlab-org/gitlab-ce!32683
| * | | Add docs exception to lint-ci jobMarcel Amirault2019-09-051-0/+1
|/ / /
* | | Merge branch 'auto-devops-template-comments' into 'master'Rémy Coutable2019-09-051-11/+11
|\ \ \ | | | | | | | | | | | | | | | | Add spaces to devops ci template to reduce warnings See merge request gitlab-org/gitlab-ce!32681
| * | | Add spaces to devops ci template to reduce warningsMarcel Amirault2019-09-051-11/+11
|/ / /
* | | Merge branch 'ab/unconfirmed-email-index' into 'master'Andreas Brandl2019-09-053-1/+24
|\ \ \ | | | | | | | | | | | | | | | | Create index for users.unconfirmed_email See merge request gitlab-org/gitlab-ce!32664
| * | | Create index for users.unconfirmed_emailab/unconfirmed-email-indexAndreas Brandl2019-09-043-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up the following query: ```sql SELECT users.* FROM users WHERE users.unconfirmed_email = ? ORDER BY users.id ASC LIMIT 1 ``` Presumably, this is a query coming from Devise. Context is https://gitlab.com/gitlab-org/gitlab-ce/issues/66958.
* | | | Merge branch 'fj-66723-add-dns-rebinding-protection-check' into 'master'Thong Kuah2019-09-053-44/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow not resolvable urls when dns rebinding setting is disabled See merge request gitlab-org/gitlab-ce!32523
| * | | | Allow not resolvable urls when rebinding setting is disabledFrancisco Javier López2019-09-053-44/+84
|/ / / / | | | | | | | | | | | | | | | | Now, when the dns rebinging setting is disabled, we will allow urls that are not resolvable.
* | | | Merge branch 'docs-debug-harishsr' into 'master'Evan Read2019-09-054-10/+1531
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port 3 more debug docs to the docs project Closes #63035 See merge request gitlab-org/gitlab-ce!31368
| * | | | Move 3 references from debug project to docsMarcel Amirault2019-09-054-10/+1531
|/ / / / | | | | | | | | | | | | | | | | Move rails and linux cheat sheets, and test_environment reference docs to the docs project
* | | | Merge branch 'docs-qa-prefer-multiple-files' into 'master'Sanad Liaquat2019-09-051-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Split tests across files for the sake of parallelization See merge request gitlab-org/gitlab-ce!32686
| * | | | Split tests across files for the sake of parallelizationMark Lapierre2019-09-051-0/+17
|/ / / /
* | | | Merge branch 'docs-zd-130525' into 'master'Evan Read2019-09-051-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Add role level note to projects permission See merge request gitlab-org/gitlab-ce!32483
| * | | | Docs: Add role level note to projects permissionCynthia Ng2019-09-051-1/+3
|/ / / /
* | | | Merge branch 'tc-ce-archive-old-geo-update-docs' into 'master'Evan Read2019-09-053-427/+448
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Separate doc for version specific Geo update steps Closes gitlab-ee#11881 See merge request gitlab-org/gitlab-ce!32542
| * | | Separate doc for version specific Geo update stepsToon Claes2019-09-053-427/+448
|/ / / | | | | | | | | | | | | | | | | | | | | | To emphasize the happy path for updating Geo nodes, put the version specific steps in a separate document and cross-link them for discoverability. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11881
* | | Merge branch 'mj/code-review-avoid' into 'master'Ash McKenzie2019-09-051-2/+7
|\ \ \ | | | | | | | | | | | | | | | | What to avoid in code review See merge request gitlab-org/gitlab-ce!32592
| * | | What to avoid in code reviewmj/code-review-avoidMarin Jankovski2019-09-041-2/+7
| | | |
* | | | Merge branch 'fix/regression-remove-installation-pod' into 'master'Mayra Cabrera2019-09-045-4/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bring method back that was mistakenly removed See merge request gitlab-org/gitlab-ce!32667
| * | | | Bring method back that was mistakenly removedJoão Cunha2019-09-045-4/+25
|/ / / / | | | | | | | | | | | | - We're also improving specs to avoid this could happen again
* | | | Merge branch '62535-upgrade-graphql-gem-to-latest-version-1-9-6-or-higher' ↵Mayra Cabrera2019-09-0410-23/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Upgrade GraphQL gem to 1.9.11 See merge request gitlab-org/gitlab-ce!31980
| * | | | Upgrade graphql gem to 1.9.10Brett Walker2019-09-0410-23/+37
|/ / / / | | | | | | | | | | | | | | | | | | | | - `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
* | | | Merge branch ↵Paul Slaughter2019-09-046-14/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12155-update-pipelines-minutes-expiry-banner-to-an-alert-component-type-ce' into 'master' CE - Update pipelines minutes expiry banner to an alert component type See merge request gitlab-org/gitlab-ce!31654
| * | | | Update Pipelines Minutes expire banner (CE)Ammar Alakkad2019-09-046-14/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | - remove hiding the alert functionality - use `danger` class instead of `warning` https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786
* | | | Merge branch ↵Mayra Cabrera2019-09-044-29/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64009-show-a-meaningful-error-message-when-due-quick_actions-command-fails-because-the-date-format-is-invalid' into 'master' Resolve "Show a meaningful error message when /due quick_actions command fails because the date format is invalid" See merge request gitlab-org/gitlab-ce!32349
| * | | | Show meaningful message on /due quick action with invalid date🙈 jacopo beschi 🙉2019-09-044-29/+46
|/ / / / | | | | | | | | | | | | | | | | When using /due quick action with an invalid date a meaninful error message is shown.
* | | | Merge branch 'ab-add-index-for-ci-builds-metrics' into 'master'Mayra Cabrera2019-09-043-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Create partial index for gitlab-monitor CI metrics See merge request gitlab-org/gitlab-ce!32546
| * | | | Create partial index for gitlab-monitor CI metricsab-add-index-for-ci-builds-metricsAndreas Brandl2019-09-043-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This creates a partial index intended to speed up queries on `ci_builds`. Particularly, `gitlab-monitor` has rather heavy queries. Those have been changed to only look back 7 days and benefit from this index tremendously. Relates to https://gitlab.com/gitlab-org/gitlab-exporter/merge_requests/101.
* | | | | Merge branch 'an-stricter-prom-checks' into 'master'Mayra Cabrera2019-09-042-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stricter validation of prometheus label values See merge request gitlab-org/gitlab-ce!32460
| * | | | | Stricter validation of prometheus label valuesAndrew Newdigate2019-09-042-3/+3
|/ / / / / | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/38
* | | | | Merge branch 'docs/13496-use-security-dashboard-in-pipelines-view' into 'master'Achilleas Pipinellis2019-09-0410-21/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Pipeline Security Dashboard documentation See merge request gitlab-org/gitlab-ce!32396
| * | | | | Update Pipeline Security Dashboard documentationMark Florian2019-09-0410-21/+21
|/ / / / / | | | | | | | | | | | | | | | Tracked in https://gitlab.com/gitlab-org/gitlab-ee/issues/13496.
* | | | | Merge branch 'docs-ssot-api-templates' into 'master'Achilleas Pipinellis2019-09-044-1/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT for API template docs Closes #64589 See merge request gitlab-org/gitlab-ce!31320
| * | | | | Added SSoT front and back matterMatt Penna2019-09-044-1/+82
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | These docs are straightforward API reference material and needed only to have document type header and troubleshooting footer added for the SSoT effort.
* | | | | Merge branch 'remove-unnecessary-freeze-in-app' into 'master'Mayra Cabrera2019-09-044-5/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Remove unnecessary freeze in app See merge request gitlab-org/gitlab-ce!32636
| * | | | Remove unnecessary freeze in appDinesh Panda2019-09-044-5/+5
|/ / / /
* | | | Merge branch 'docs-storage-counteer' into 'master'Achilleas Pipinellis2019-09-041-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adds docs for total usage storage quota See merge request gitlab-org/gitlab-ce!32600
| * | | | Adds docs for total usage storage quotaFilipa Lacerda2019-09-041-0/+6
|/ / / /
* | | | Merge branch '62535-upgrade-graphql-gem-to-version-1-8-17' into 'master'Mayra Cabrera2019-09-0428-58/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade GraphQL gem to 1.8.17 See merge request gitlab-org/gitlab-ce!32299
View Lorry Controller Status