Automatic merge of gitlab-org/gitlab master

doc/.vale/gitlab/Acronyms.yml

@@ -41,6 +41,7 @@ exceptions:
   - GCP
   - GDK
   - GET
+  - GIF
   - GKE
   - GNU
   - GPG
@@ -56,6 +57,8 @@ exceptions:
   - IMAP
   - IRC
   - ISO
+  - JPEG
+  - JPG
   - JSON
   - LAN
   - LDAP
@@ -76,6 +79,7 @@ exceptions:
   - PDF
   - PGP
   - PHP
+  - PNG
   - POST
   - PUT
   - RAM
@@ -92,6 +96,7 @@ exceptions:
   - SCP
   - SCSS
   - SDK
+  - SEO
   - SHA
   - SLA
   - SMTP

doc/.vale/gitlab/spelling-exceptions.txt

@@ -120,6 +120,7 @@ dequarantining
 DevOps
 discoverability
 Disqus
+Divio
 Dockerfile
 Dockerfiles
 dogfood
@@ -344,6 +345,7 @@ prepend
 prepended
 prepending
 prepends
+Prettifier
 Pritaly
 profiler
 Prometheus

ee/app/assets/javascripts/environments_dashboard/components/dashboard/project_header.vue

 <script>
-import { GlTooltipDirective, GlLink, GlButton, GlIcon } from '@gitlab/ui';
+import { GlDropdown, GlDropdownItem, GlTooltipDirective, GlLink, GlIcon } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
 
 export default {
   components: {
+    GlDropdown,
+    GlDropdownItem,
     GlIcon,
     ProjectAvatar,
     GlLink,
-    GlButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -32,9 +33,9 @@ export default {
 
 <template>
   <div
-    class="d-flex align-items-center page-title-holder text-secondary justify-content-between pb-2 mb-3"
+    class="gl-display-flex gl-align-items-center page-title-holder text-secondary gl-justify-content-space-between pb-2 mb-3"
   >
-    <div class="d-flex align-items-center">
+    <div class="gl-display-flex gl-align-items-center">
       <project-avatar :project="project.namespace" :size="20" class="flex-shrink-0" />
       <gl-link class="js-namespace-link text-secondary" :href="`/${project.namespace.full_path}`">
         <span class="js-namespace gl-mr-3"> {{ project.namespace.name }} </span>
@@ -45,23 +46,23 @@ export default {
         <span class="js-name gl-mr-3"> {{ project.name }} </span>
       </gl-link>
     </div>
-    <div class="dropdown js-more-actions">
-      <button
-        v-gl-tooltip
-        class="js-more-actions-toggle d-flex align-items-center ml-2 btn btn-transparent"
-        type="button"
-        data-toggle="dropdown"
-        :title="$options.moreActionsText"
+    <div class="gl-display-flex js-more-actions">
+      <gl-dropdown
+        toggle-class="js-more-actions-toggle gl-display-flex gl-align-items-center gl-px-3! gl-bg-transparent gl-shadow-none!"
+        right
       >
-        <gl-icon name="ellipsis_v" class="text-secondary" />
-      </button>
-      <ul class="dropdown-menu dropdown-menu-right">
-        <li>
-          <gl-button class="js-remove-button" variant="link" @click="onRemove()">
-            <span class="text-danger"> {{ $options.removeProjectText }} </span>
-          </gl-button>
-        </li>
-      </ul>
+        <template #button-content>
+          <gl-icon
+            v-gl-tooltip
+            :title="$options.moreActionsText"
+            name="ellipsis_v"
+            class="text-secondary"
+          />
+        </template>
+        <gl-dropdown-item class="js-remove-button" variant="link" @click="onRemove()">
+          <span class="text-danger"> {{ $options.removeProjectText }} </span>
+        </gl-dropdown-item>
+      </gl-dropdown>
     </div>
   </div>
 </template>

ee/app/views/shared/_epics.html.haml

-.card.card-without-border
-  %ul.content-list.issuable-list
-    = render partial: 'groups/epics/epic', collection: @epics
+%ul.content-list.issuable-list
+  = render partial: 'groups/epics/epic', collection: @epics
 
 = paginate_collection @epics

ee/changelogs/unreleased/289967-remove-bootstrap-4-s-cards-components-from-epics.yml

+---
+title: Remove Bootstrap 4's Cards class name from Epics
+merge_request: 48856
+author: Takuya Noguchi
+type: performance

ee/spec/frontend/environments_dashboard/components/__snapshots__/project_header_spec.js.snap

@@ -2,10 +2,10 @@
 
 exports[`Project Header matches the snapshot 1`] = `
 <div
-  class="d-flex align-items-center page-title-holder text-secondary justify-content-between pb-2 mb-3"
+  class="gl-display-flex gl-align-items-center page-title-holder text-secondary gl-justify-content-space-between pb-2 mb-3"
 >
   <div
-    class="d-flex align-items-center"
+    class="gl-display-flex gl-align-items-center"
   >
     <project-avatar-stub
       class="flex-shrink-0"
@@ -48,41 +48,35 @@ exports[`Project Header matches the snapshot 1`] = `
   </div>
    
   <div
-    class="dropdown js-more-actions"
+    class="gl-display-flex js-more-actions"
   >
-    <button
-      class="js-more-actions-toggle d-flex align-items-center ml-2 btn btn-transparent"
-      data-toggle="dropdown"
-      title="More actions"
-      type="button"
+    <gl-dropdown-stub
+      category="primary"
+      headertext=""
+      right=""
+      size="medium"
+      text=""
+      toggleclass="js-more-actions-toggle gl-display-flex gl-align-items-center gl-px-3! gl-bg-transparent gl-shadow-none!"
+      variant="default"
     >
-      <gl-icon-stub
-        class="text-secondary"
-        name="ellipsis_v"
-        size="16"
-      />
-    </button>
-     
-    <ul
-      class="dropdown-menu dropdown-menu-right"
-    >
-      <li>
-        <gl-button-stub
-          buttontextclasses=""
-          category="primary"
-          class="js-remove-button"
-          icon=""
-          size="medium"
-          variant="link"
+       
+      <gl-dropdown-item-stub
+        avatarurl=""
+        class="js-remove-button"
+        iconcolor=""
+        iconname=""
+        iconrightarialabel=""
+        iconrightname=""
+        secondarytext=""
+        variant="link"
+      >
+        <span
+          class="text-danger"
         >
-          <span
-            class="text-danger"
-          >
-             Remove 
-          </span>
-        </gl-button-stub>
-      </li>
-    </ul>
+           Remove 
+        </span>
+      </gl-dropdown-item-stub>
+    </gl-dropdown-stub>
   </div>
 </div>
 `;

ee/spec/frontend/environments_dashboard/components/project_header_spec.js

-import { GlButton } from '@gitlab/ui';
+import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import component from 'ee/environments_dashboard/components/dashboard/project_header.vue';
 import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
@@ -66,21 +66,18 @@ describe('Project Header', () => {
   describe('more actions', () => {
     it('should list "remove" as an action', () => {
       const removeLink = wrapper
-        .find('.dropdown-menu')
-        .findAll('li')
+        .find(GlDropdown)
+        .findAll(GlDropdownItem)
         .filter(w => w.text() === 'Remove');
       expect(removeLink.exists()).toBe(true);
     });
 
     it('should emit a "remove" event when "remove" is clicked', () => {
       const removeLink = wrapper
-        .find('.dropdown-menu')
-        .findAll('li')
+        .find(GlDropdown)
+        .findAll(GlDropdownItem)
         .filter(w => w.text() === 'Remove');
-      removeLink
-        .at(0)
-        .find(GlButton)
-        .vm.$emit('click');
+      removeLink.at(0).vm.$emit('click');
 
       return wrapper.vm.$nextTick().then(() => {
         expect(wrapper.emitted('remove')).toContainEqual([propsData.project.remove_path]);

qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb

@@ -3,9 +3,8 @@
 require 'faker'
 
 module QA
-  RSpec.describe 'Verify', :runner, :requires_admin, :skip_live_env do
-    describe "Include multiple files from a project" do
-      let(:feature_flag) { :ci_include_multiple_files_from_project }
+  RSpec.describe 'Verify', :runner do
+    describe 'Include multiple files from a project' do
       let(:executor) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
       let(:expected_text) { Faker::Lorem.sentence }
       let(:unexpected_text) { Faker::Lorem.sentence }
@@ -31,7 +30,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(feature_flag)
         Flow::Login.sign_in
         add_included_files
         add_main_ci_file
@@ -40,7 +38,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(feature_flag)
         runner.remove_via_api!
       end
 

qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb

@@ -3,9 +3,8 @@
 require 'faker'
 
 module QA
-  RSpec.describe 'Verify', :runner, :requires_admin do
-    describe "Pass dotenv variables to downstream via bridge" do
-      let(:feature_flag) { :ci_bridge_dependency_variables }
+  RSpec.describe 'Verify', :runner do
+    describe 'Pass dotenv variables to downstream via bridge' do
       let(:executor_1) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
       let(:executor_2) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
 
@@ -38,7 +37,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(feature_flag)
         Flow::Login.sign_in
         add_ci_file(downstream_project, downstream_ci_file)
         add_ci_file(upstream_project, upstream_ci_file)
@@ -47,7 +45,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(feature_flag)
         runner_1.remove_via_api!
         runner_2.remove_via_api!
       end

qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Verify' do
-    describe 'Run pipeline', only: { subdomain: :staging } do
+    describe 'Run pipeline' do
       context 'with web only rule' do
         let(:job_name) { 'test_job' }
         let(:project) do

qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb

@@ -3,11 +3,8 @@
 require 'faker'
 
 module QA
-  RSpec.describe 'Verify', :runner, :requires_admin do
-    # [TODO]: Developer to remove :requires_admin once FF is removed in follow up issue
-
+  RSpec.describe 'Verify', :runner do
     describe "Trigger child pipeline with 'when:manual'" do
-      let(:feature_flag) { :ci_manual_bridges } # [TODO]: Developer to remove when feature flag is removed
       let(:executor) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
 
       let(:project) do
@@ -25,7 +22,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(feature_flag) # [TODO]: Developer to remove when feature flag is removed
         Flow::Login.sign_in
         add_ci_files
         project.visit!
@@ -33,7 +29,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(feature_flag) # [TODO]: Developer to remove when feature flag is removed
         runner.remove_via_api!
       end