From 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 Feb 2020 15:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .eslintrc.yml | 3 - .../diffs/components/settings_dropdown.vue | 2 +- .../ide/components/new_dropdown/index.vue | 2 +- app/assets/javascripts/ide/stores/actions.js | 11 --- app/assets/javascripts/ide/stores/actions/file.js | 4 +- .../javascripts/ide/stores/mutation_types.js | 1 - app/assets/javascripts/ide/stores/mutations.js | 7 +- .../javascripts/ide/stores/mutations/file.js | 3 + .../list/components/release_block_assets.vue | 2 +- .../repository/components/breadcrumbs.vue | 8 +-- .../repository/components/table/parent_row.vue | 2 +- .../repository/components/table/row.vue | 2 +- app/assets/javascripts/repository/index.js | 2 +- app/assets/javascripts/repository/log_tree.js | 5 +- .../components/droplab_dropdown_button.vue | 2 +- app/controllers/projects/tree_controller.rb | 2 +- app/controllers/projects_controller.rb | 2 +- app/finders/projects_finder.rb | 2 +- app/helpers/projects_helper.rb | 2 +- app/models/project.rb | 4 +- app/views/groups/_home_panel.html.haml | 2 +- app/views/projects/buttons/_clone.html.haml | 2 +- app/views/projects/buttons/_download.html.haml | 2 +- app/views/projects/compare/_form.html.haml | 4 +- app/views/projects/tree/_tree_header.html.haml | 2 +- app/views/shared/_mobile_clone_panel.html.haml | 2 +- .../shared/notifications/_new_button.html.haml | 4 +- .../36422-add-nuget-installation-commands.yml | 5 ++ changelogs/unreleased/dz-scope-security-routes.yml | 5 ++ changelogs/unreleased/ph-enableVueFileListFlag.yml | 5 ++ config/routes/project.rb | 3 +- doc/administration/auditor_users.md | 2 +- .../auth/how_to_configure_ldap_gitlab_ee/index.md | 2 +- doc/administration/database_load_balancing.md | 6 +- .../disaster_recovery/background_verification.md | 2 +- doc/administration/gitaly/index.md | 2 +- doc/administration/high_availability/redis.md | 2 +- doc/administration/instance_limits.md | 2 +- doc/administration/instance_review.md | 2 +- doc/administration/integration/plantuml.md | 2 +- doc/administration/integration/terminal.md | 4 +- doc/administration/job_artifacts.md | 2 +- doc/administration/job_logs.md | 2 +- doc/administration/lfs/lfs_administration.md | 4 +- doc/administration/logs.md | 6 +- doc/administration/monitoring/github_imports.md | 2 +- .../monitoring/prometheus/gitlab_exporter.md | 4 +- .../monitoring/prometheus/gitlab_metrics.md | 2 +- doc/administration/monitoring/prometheus/index.md | 2 +- .../monitoring/prometheus/pgbouncer_exporter.md | 2 +- .../monitoring/prometheus/postgres_exporter.md | 2 +- .../monitoring/prometheus/redis_exporter.md | 2 +- .../monitoring/prometheus/registry_exporter.md | 2 +- doc/administration/operations/ssh_certificates.md | 2 +- doc/administration/packages/container_registry.md | 4 +- doc/administration/pages/index.md | 8 +-- doc/administration/pages/source.md | 4 +- doc/administration/pseudonymizer.md | 2 +- doc/administration/raketasks/github_import.md | 2 +- doc/administration/raketasks/ldap.md | 2 +- doc/administration/repository_checks.md | 2 +- doc/administration/repository_storage_paths.md | 4 +- doc/administration/server_hooks.md | 2 +- .../static_objects_external_storage.md | 2 +- .../troubleshooting/gitlab_rails_cheat_sheet.md | 2 +- doc/administration/uploads.md | 4 +- doc/api/README.md | 8 +-- doc/api/applications.md | 2 +- doc/api/avatar.md | 2 +- doc/api/award_emoji.md | 2 +- doc/api/boards.md | 2 +- doc/api/commits.md | 10 +-- doc/api/epic_links.md | 2 +- doc/api/epics.md | 6 +- doc/api/graphql/index.md | 4 +- doc/api/group_badges.md | 2 +- doc/api/group_boards.md | 2 +- doc/api/group_clusters.md | 2 +- doc/api/group_labels.md | 6 +- doc/api/group_milestones.md | 2 +- doc/api/groups.md | 2 +- doc/api/issues.md | 16 ++--- doc/api/jobs.md | 10 +-- doc/api/labels.md | 6 +- doc/api/lint.md | 2 +- doc/api/markdown.md | 2 +- doc/api/members.md | 2 +- doc/api/merge_requests.md | 18 ++--- doc/api/notification_settings.md | 6 +- doc/api/packages.md | 10 +-- doc/api/pipelines.md | 6 +- doc/api/project_badges.md | 2 +- doc/api/project_clusters.md | 2 +- doc/api/projects.md | 6 +- doc/api/protected_branches.md | 2 +- doc/api/repository_files.md | 2 +- doc/api/runners.md | 4 +- doc/api/scim.md | 2 +- doc/api/services.md | 8 +-- doc/api/snippets.md | 4 +- doc/api/todos.md | 8 +-- doc/api/users.md | 4 +- doc/api/v3_to_v4.md | 80 +++++++++++----------- doc/api/visual_review_discussions.md | 2 +- doc/api/vulnerability_findings.md | 2 +- doc/api/wikis.md | 2 +- doc/ci/README.md | 2 +- doc/ci/chatops/README.md | 4 +- doc/ci/ci_cd_for_external_repos/index.md | 2 +- doc/ci/docker/using_docker_build.md | 2 +- doc/ci/environments.md | 6 +- doc/ci/environments/protected_environments.md | 2 +- doc/ci/merge_request_pipelines/index.md | 2 +- doc/ci/pipelines.md | 20 +++--- doc/ci/runners/README.md | 4 +- doc/ci/triggers/README.md | 4 +- doc/ci/variables/README.md | 2 +- doc/ci/yaml/README.md | 30 ++++---- doc/development/api_graphql_styleguide.md | 2 +- doc/development/application_limits.md | 2 +- doc/development/code_review.md | 8 +-- .../contributing/merge_request_workflow.md | 8 +-- doc/development/database_review.md | 2 +- doc/development/deleting_migrations.md | 2 +- .../documentation/site_architecture/global_nav.md | 6 +- .../site_architecture/release_process.md | 4 +- doc/development/documentation/structure.md | 4 +- doc/development/documentation/styleguide.md | 20 ++++-- doc/development/documentation/workflow.md | 2 +- doc/development/ee_features.md | 2 +- doc/development/filtering_by_label.md | 2 +- doc/development/i18n/externalization.md | 2 +- doc/development/i18n/merging_translations.md | 4 +- doc/development/namespaces_storage_statistics.md | 4 +- .../new_fe_guide/modules/dirty_submit.md | 2 +- doc/development/packages.md | 6 +- doc/development/prometheus_metrics.md | 2 +- doc/development/routing.md | 2 +- doc/development/testing_guide/best_practices.md | 2 +- doc/development/testing_guide/flaky_tests.md | 48 ++++++------- doc/development/testing_guide/review_apps.md | 2 +- doc/install/installation.md | 2 +- doc/integration/elasticsearch.md | 6 +- doc/integration/saml.md | 2 +- doc/integration/slash_commands.md | 2 +- doc/integration/sourcegraph.md | 2 +- doc/public_access/public_access.md | 2 +- doc/raketasks/backup_restore.md | 2 +- doc/security/password_length_limits.md | 4 +- doc/security/two_factor_authentication.md | 2 +- doc/topics/autodevops/index.md | 16 ++--- doc/university/training/end-user/README.md | 2 +- doc/university/training/topics/merge_requests.md | 2 +- doc/university/training/user_training.md | 2 +- doc/user/admin_area/appearance.md | 2 +- doc/user/admin_area/credentials_inventory.md | 2 +- doc/user/admin_area/geo_nodes.md | 2 +- doc/user/admin_area/monitoring/health_check.md | 4 +- .../settings/account_and_limit_settings.md | 2 +- .../admin_area/settings/continuous_integration.md | 4 +- doc/user/admin_area/settings/email.md | 4 +- .../admin_area/settings/external_authorization.md | 2 +- .../settings/rate_limits_on_raw_endpoints.md | 2 +- .../admin_area/settings/sign_up_restrictions.md | 6 +- doc/user/admin_area/settings/terms.md | 2 +- doc/user/admin_area/settings/third_party_offers.md | 2 +- doc/user/admin_area/settings/usage_statistics.md | 6 +- .../settings/visibility_and_access_controls.md | 2 +- doc/user/analytics/cycle_analytics.md | 2 +- doc/user/analytics/productivity_analytics.md | 2 +- .../application_security/configuration/index.md | 2 +- .../container_scanning/index.md | 2 +- doc/user/application_security/sast/index.md | 2 +- doc/user/award_emojis.md | 8 +-- doc/user/clusters/applications.md | 12 ++-- doc/user/discussions/index.md | 18 ++--- doc/user/feature_highlight.md | 2 +- doc/user/group/clusters/index.md | 6 +- doc/user/group/index.md | 4 +- doc/user/group/saml_sso/scim_setup.md | 2 +- doc/user/markdown.md | 6 +- doc/user/packages/container_registry/index.md | 2 +- doc/user/packages/index.md | 2 +- doc/user/packages/maven_repository/index.md | 4 +- doc/user/permissions.md | 2 +- doc/user/profile/account/delete_account.md | 8 +-- doc/user/profile/active_sessions.md | 2 +- doc/user/profile/index.md | 4 +- doc/user/profile/personal_access_tokens.md | 14 ++-- doc/user/project/clusters/add_remove_clusters.md | 4 +- doc/user/project/clusters/index.md | 8 +-- doc/user/project/clusters/kubernetes_pod_logs.md | 6 +- doc/user/project/clusters/serverless/index.md | 2 +- doc/user/project/code_owners.md | 2 +- doc/user/project/deploy_boards.md | 2 +- doc/user/project/deploy_tokens/index.md | 8 +-- doc/user/project/description_templates.md | 4 +- doc/user/project/file_lock.md | 2 +- doc/user/project/import/bitbucket_server.md | 2 +- .../project/integrations/discord_notifications.md | 2 +- doc/user/project/integrations/project_services.md | 2 +- doc/user/project/integrations/prometheus.md | 14 ++-- .../integrations/prometheus_library/cloudwatch.md | 2 +- .../integrations/prometheus_library/haproxy.md | 2 +- .../integrations/prometheus_library/index.md | 2 +- .../integrations/prometheus_library/kubernetes.md | 4 +- .../integrations/prometheus_library/nginx.md | 2 +- .../prometheus_library/nginx_ingress.md | 2 +- .../prometheus_library/nginx_ingress_vts.md | 2 +- doc/user/project/integrations/webhooks.md | 2 +- doc/user/project/issue_board.md | 2 +- doc/user/project/issues/associate_zoom_meeting.md | 2 +- doc/user/project/issues/confidential_issues.md | 2 +- doc/user/project/issues/csv_export.md | 6 +- doc/user/project/issues/csv_import.md | 2 +- doc/user/project/issues/due_dates.md | 2 +- doc/user/project/issues/index.md | 2 +- doc/user/project/issues/issue_weight.md | 2 +- doc/user/project/issues/managing_issues.md | 2 +- doc/user/project/issues/related_issues.md | 2 +- .../project/merge_requests/allow_collaboration.md | 2 +- .../merge_requests/browser_performance_testing.md | 2 +- doc/user/project/merge_requests/code_quality.md | 2 +- .../merge_requests/creating_merge_requests.md | 2 +- .../merge_requests/merge_request_approvals.md | 2 +- .../merge_requests/merge_request_dependencies.md | 4 +- .../merge_requests/merge_when_build_succeeds.md | 2 +- .../project/merge_requests/resolve_conflicts.md | 4 +- .../project/merge_requests/squash_and_merge.md | 4 +- doc/user/project/milestones/burndown_charts.md | 6 +- doc/user/project/operations/feature_flags.md | 2 +- doc/user/project/operations/tracing.md | 2 +- doc/user/project/pages/index.md | 4 +- doc/user/project/pipelines/job_artifacts.md | 4 +- doc/user/project/pipelines/schedules.md | 8 +-- doc/user/project/pipelines/settings.md | 8 +-- doc/user/project/protected_branches.md | 12 ++-- doc/user/project/protected_tags.md | 2 +- doc/user/project/push_options.md | 12 ++-- doc/user/project/quick_actions.md | 6 +- doc/user/project/repository/branches/index.md | 4 +- .../project/repository/gpg_signed_commits/index.md | 2 +- .../project/repository/repository_mirroring.md | 22 +++--- doc/user/project/repository/web_editor.md | 2 +- doc/user/project/time_tracking.md | 2 +- doc/user/project/web_ide/index.md | 10 +-- doc/user/search/advanced_global_search.md | 4 +- doc/user/search/index.md | 2 +- doc/user/todos.md | 4 +- locale/gitlab.pot | 33 +++++++++ package.json | 8 +-- qa/qa/page/base.rb | 6 -- qa/qa/page/component/select2.rb | 4 ++ qa/qa/page/project/issue/show.rb | 2 +- qa/qa/page/project/new.rb | 3 +- .../pipeline/create_and_process_pipeline_spec.rb | 2 +- scripts/lint-doc.sh | 2 +- spec/frontend/ide/stores/mutations/file_spec.js | 29 ++++++++ spec/frontend/ide/stores/mutations_spec.js | 20 +++--- .../repository/components/breadcrumbs_spec.js | 11 +++ .../repository/components/table/parent_row_spec.js | 7 +- .../repository/components/table/row_spec.js | 16 +++++ spec/javascripts/ide/stores/actions_spec.js | 13 +--- spec/models/project_spec.rb | 6 +- yarn.lock | 24 +++---- 265 files changed, 694 insertions(+), 610 deletions(-) create mode 100644 changelogs/unreleased/36422-add-nuget-installation-commands.yml create mode 100644 changelogs/unreleased/dz-scope-security-routes.yml create mode 100644 changelogs/unreleased/ph-enableVueFileListFlag.yml diff --git a/.eslintrc.yml b/.eslintrc.yml index 07542c42891..ff59dbe0a81 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -10,9 +10,6 @@ globals: localStorage: false IS_EE: false plugins: - - import - - "@gitlab/i18n" - - "@gitlab/vue-i18n" - no-jquery settings: import/resolver: diff --git a/app/assets/javascripts/diffs/components/settings_dropdown.vue b/app/assets/javascripts/diffs/components/settings_dropdown.vue index 0129763161a..08e991c4791 100644 --- a/app/assets/javascripts/diffs/components/settings_dropdown.vue +++ b/app/assets/javascripts/diffs/components/settings_dropdown.vue @@ -31,7 +31,7 @@ export default { data-toggle="dropdown" data-display="static" > - +