summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Stubbing ApplicationSetting.current in stub_application_settingfj-stub-application-setting-currentFrancisco Javier López2019-09-059-23/+21
|
* Merge branch ↵Peter Leitzen2019-09-055-36/+13
|\ | | | | | | | | | | | | | | | | '66150-remove-dynamically-constructed-feature-flags-starting-with-prometheus_transaction_' into 'master' Resolve "Remove dynamically constructed feature flags starting with `prometheus_transaction_`" Closes #66150 See merge request gitlab-org/gitlab-ce!32395
| * Remove feature flags starting with `prometheus_transaction_`Jacopo2019-09-055-36/+13
| | | | | | | | Those feature flags were always enabled so we can remove them safely.
* | Merge branch '66067-pages-domain-doesnt-set-target-blank' into 'master'Dmitriy Zaporozhets2019-09-056-8/+37
|\ \ | | | | | | | | | | | | | | | | | | Makes custom Pages domain open as external link in new tab Closes #66067 See merge request gitlab-org/gitlab-ce!32130
| * | Allow for the passing of options to external_link66067-pages-domain-doesnt-set-target-blankjakeburden2019-09-032-2/+7
| | |
| * | Create and use external_link helperjakeburden2019-09-036-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a helper method that takes body text and a url. The output is a external link with icon. It contains the noopenner noreferrer attributes for security. Usage: external_link(domain.title, domain.url) Add rspec test for ExternalLinkHelper Add changelog for MR 32130
| * | Use “_blank” instead of :_blankjakeburden2019-09-022-3/+3
| | |
| * | Add attributes to open deployed pages in new tabjakeburden2019-09-021-2/+8
| | |
| * | Add attributes to securely open external linksjakeburden2019-09-021-1/+1
| | |
| * | Makes Page domain open as external link in new tabjakeburden2019-09-021-1/+1
| | | | | | | | | | | | Additionally adds noopener noreferrer as addtional security
* | | Merge branch ↵Achilleas Pipinellis2019-09-055-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'docs/9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard' into 'master' Update security dashboards documentation See merge request gitlab-org/gitlab-ce!32674
| * | | Update security dashboards documentationPaul Gascou-Vaillancourt2019-09-055-2/+5
|/ / / | | | | | | | | | | | | Reflect the addition of a "hide dismissed vulnerabilities" toggle in security dashboards, see https://gitlab.com/gitlab-org/gitlab-ee/issues/9102
* | | Merge branch 'winh-frontend-ci-roulette' into 'master'Paul Slaughter2019-09-051-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Add .gitlab/ci/frontend.gitlab-ci.yml to frontend review roulette See merge request gitlab-org/gitlab-ce!32466
| * | | Add .gitlab/ci/frontend.gitlab-ci.yml to frontend review rouletteWinnie Hellmann2019-09-051-1/+2
|/ / /
* | | Merge branch 'bjk/routable_counter' into 'master'Andreas Brandl2019-09-051-8/+4
|\ \ \ | | | | | | | | | | | | | | | | Adjust routable metric See merge request gitlab-org/gitlab-ce!32591
| * | | Adjust routable metricbjk/routable_counterBen Kochie2019-09-051-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Define the counter once. * Make metric name follow Prometheus naming conventions. * Add label for call method.
* | | | 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
View Lorry Controller Status