From f4251f269416f881d921a1bf89de802e4a70c11a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 2 Jun 2020 06:08:01 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../groups/components/group_item.vue | 2 +- .../groups/components/item_actions.vue | 4 +- .../groups/components/item_stats.vue | 8 +- .../javascripts/snippets/components/edit.vue | 13 ++- app/assets/javascripts/snippets/constants.js | 3 + app/assets/stylesheets/pages/groups.scss | 26 ------ .../chat_message/pipeline_message.rb | 6 +- .../project_services/hipchat_service.rb | 4 +- .../projects/update_remote_mirror_service.rb | 6 +- ...ltering-by-groups-icons-are-misaligned.yml | 6 ++ .../dz-redirect-unscoped-pipelines-routes.yml | 5 ++ .../fix-ecs-detached-branch-pipeline.yml | 5 ++ .../fj-fix-snippet-import-from-database.yml | 5 ++ changelogs/unreleased/mg-fix-katex-fonts.yml | 5 ++ config/routes/project.rb | 13 +-- config/webpack.config.js | 1 + doc/development/secure_coding_guidelines.md | 8 +- .../getting_started/fork_sample_project.md | 2 +- .../new_or_existing_website.md | 59 ++++++------- .../getting_started/pages_bundled_template.md | 29 ++++--- .../project/pages/img/choose_ci_template.png | Bin 23532 -> 0 bytes .../pages/img/choose_ci_template_v13_1.png | Bin 0 -> 33333 bytes .../img/pages_project_templates_v11_8.png | Bin 69675 -> 0 bytes .../img/pages_project_templates_v13_1.png | Bin 0 -> 181998 bytes doc/user/project/pages/img/setup_ci.png | Bin 10032 -> 0 bytes doc/user/project/pages/img/setup_ci_v13_1.png | Bin 0 -> 15480 bytes doc/user/project/pages/index.md | 81 ++++++++++-------- .../templates/Jobs/Deploy/ECS.gitlab-ci.yml | 8 +- .../import_export/snippet_repo_restorer.rb | 9 +- locale/gitlab.pot | 12 +-- .../frontend/snippets/components/edit_spec.js | 24 ++++++ .../ci/status/stage/play_manual_spec.rb | 2 +- spec/lib/gitlab/etag_caching/router_spec.rb | 12 +-- .../snippet_repo_restorer_spec.rb | 7 +- .../action_dispatch_journey_formatter_spec.rb | 2 +- spec/models/ci/build_spec.rb | 2 +- .../chat_message/pipeline_message_spec.rb | 34 ++++---- .../project_services/hipchat_service_spec.rb | 4 +- .../merge_request_widget_entity_spec.rb | 2 +- .../ci/expire_pipeline_cache_service_spec.rb | 4 +- .../update_remote_mirror_service_spec.rb | 17 ++++ spec/workers/expire_job_cache_worker_spec.rb | 2 +- 42 files changed, 241 insertions(+), 191 deletions(-) create mode 100644 changelogs/unreleased/213009-when-filtering-by-groups-icons-are-misaligned.yml create mode 100644 changelogs/unreleased/dz-redirect-unscoped-pipelines-routes.yml create mode 100644 changelogs/unreleased/fix-ecs-detached-branch-pipeline.yml create mode 100644 changelogs/unreleased/fj-fix-snippet-import-from-database.yml create mode 100644 changelogs/unreleased/mg-fix-katex-fonts.yml delete mode 100644 doc/user/project/pages/img/choose_ci_template.png create mode 100644 doc/user/project/pages/img/choose_ci_template_v13_1.png delete mode 100644 doc/user/project/pages/img/pages_project_templates_v11_8.png create mode 100644 doc/user/project/pages/img/pages_project_templates_v13_1.png delete mode 100644 doc/user/project/pages/img/setup_ci.png create mode 100644 doc/user/project/pages/img/setup_ci_v13_1.png diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 5fe58c5e512..0fb06dab635 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -122,7 +122,7 @@ export default { v-tooltip :href="group.relativePath" :title="group.fullName" - class="no-expand gl-mt-3 gl-mr-3" + class="no-expand gl-mt-3 gl-mr-3 gl-text-gray-900!" data-placement="bottom" >{{ // ending bracket must be by closing tag to prevent diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index 5454480e61a..985ea5a9019 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -53,7 +53,7 @@ export default { :aria-label="leaveBtnTitle" data-container="body" data-placement="bottom" - class="leave-group btn btn-xs no-expand" + class="leave-group btn btn-xs no-expand gl-text-gray-700 gl-ml-5" @click.prevent="onLeaveGroup" > @@ -66,7 +66,7 @@ export default { :aria-label="editBtnTitle" data-container="body" data-placement="bottom" - class="edit-group btn btn-xs no-expand" + class="edit-group btn btn-xs no-expand gl-text-gray-700 gl-ml-5" > diff --git a/app/assets/javascripts/groups/components/item_stats.vue b/app/assets/javascripts/groups/components/item_stats.vue index 53da3f7b2ee..ffe4b18dea1 100644 --- a/app/assets/javascripts/groups/components/item_stats.vue +++ b/app/assets/javascripts/groups/components/item_stats.vue @@ -44,26 +44,26 @@ export default {