From ea8492330b51c502b005e60e3a5ff84ec4eea467 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 8 Sep 2020 18:08:48 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .editorconfig | 2 +- GITALY_SERVER_VERSION | 2 +- .../components/ci_variable_table.vue | 1 + .../project_selector/project_list_item.vue | 23 ++- .../project_selector/project_selector.vue | 2 +- .../stylesheets/page_bundles/todos.scss | 4 + app/assets/stylesheets/pages/issues.scss | 4 +- app/assets/stylesheets/pages/settings.scss | 7 + app/views/dashboard/todos/index.html.haml | 2 +- app/views/shared/issuable/_sidebar.html.haml | 2 +- ...ss-mobile-issues-for-ci-variable-table.yml | 5 + .../220540-remove-ds-dind-from-docs.yml | 5 + changelogs/unreleased/issue-227174.yml | 5 + .../unreleased/mobile-friendly-todos-list.yml | 5 + ...date_location_fingerprint_column_for_cs.rb | 30 +++ db/schema_migrations/20200908095446 | 1 + doc/api/todos.md | 4 +- doc/ci/caching/index.md | 14 +- doc/ci/cloud_deployment/index.md | 2 +- doc/ci/docker/using_kaniko.md | 14 +- .../end_to_end_testing_webdriverio/index.md | 1 + .../laravel_with_gitlab_and_envoy/index.md | 10 - doc/ci/examples/php.md | 18 +- ...t-and-deploy-ruby-application-to-heroku.md | 22 +-- doc/ci/migration/circleci.md | 4 +- doc/ci/migration/jenkins.md | 3 - doc/ci/pipelines/pipeline_architectures.md | 4 +- doc/ci/review_apps/index.md | 16 +- doc/ci/ssh_keys/README.md | 10 +- doc/ci/variables/README.md | 12 +- doc/ci/yaml/README.md | 80 ++++---- doc/development/documentation/styleguide.md | 5 + .../testing_guide/best_practices.md | 180 ++++++++++++++++-- .../dependency_scanning/analyzers.md | 27 +-- .../dependency_scanning/index.md | 38 ---- .../merge_requests/merge_request_approvals.md | 17 +- lib/api/todos.rb | 13 +- ...erprint_for_container_scanning_findings.rb | 13 ++ locale/gitlab.pot | 2 +- .../add_context_commits_modal_spec.js.snap | 2 +- .../project_list_item_spec.js | 4 +- spec/helpers/storage_helper_spec.rb | 5 +- spec/models/namespace_spec.rb | 4 +- spec/models/project_spec.rb | 117 ++++++------ spec/models/user_agent_detail_spec.rb | 4 +- spec/models/user_interacted_project_spec.rb | 7 +- .../mutations/notes/create/diff_note_spec.rb | 2 +- .../notes/create/image_diff_note_spec.rb | 2 +- spec/requests/api/todos_spec.rb | 23 +++ 49 files changed, 476 insertions(+), 303 deletions(-) create mode 100644 changelogs/unreleased/213351-address-mobile-issues-for-ci-variable-table.yml create mode 100644 changelogs/unreleased/220540-remove-ds-dind-from-docs.yml create mode 100644 changelogs/unreleased/issue-227174.yml create mode 100644 changelogs/unreleased/mobile-friendly-todos-list.yml create mode 100644 db/post_migrate/20200908095446_update_location_fingerprint_column_for_cs.rb create mode 100644 db/schema_migrations/20200908095446 create mode 100644 lib/gitlab/background_migration/update_location_fingerprint_for_container_scanning_findings.rb diff --git a/.editorconfig b/.editorconfig index 56ce6d87145..932acffe9fc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,5 +14,5 @@ indent_size = 2 indent_style = space charset = utf-8 -[*.{md,markdown}] +[*.{md,markdown,js.snap}] trim_trailing_whitespace = false diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index b5ba6b6d7f7..1ccea0c6a8e 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -72d42e8a398b0a0b91bfc145abb145ba36eaa682 +4b9bbc37dd7bc587ee28fb7beab8b9c384a41e4c diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue index 018704bff74..501c82b419e 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue @@ -46,6 +46,7 @@ export default { { key: 'actions', label: '', + tdClass: 'text-right', customStyle: { width: '35px' }, }, ], diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue index 7996ccdf516..154671fe9fa 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue @@ -1,6 +1,6 @@ diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue index 0b91588a006..4e2029cd74f 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue @@ -100,7 +100,7 @@ export default { @bottomReached="bottomReached" >