Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue

@@ -461,7 +461,7 @@ export default {
         </markdown-field>
 
         <div v-if="isContentEditorActive">
-          <gl-alert class="gl-mb-6" variant="tip" :dismissable="false">
+          <gl-alert class="gl-mb-6" variant="tip" :dismissible="false">
             <gl-sprintf :message="$options.i18n.contentEditor.feedbackTip">
               <template
                 #link="// eslint-disable-next-line vue/no-template-shadow

ee/app/views/layouts/nav/sidebar/_profile_billing_link.html.haml

@@ -2,7 +2,7 @@
   = nav_link(controller: :billings) do
     = link_to profile_billings_path do
       .nav-icon-container
-        = custom_icon('credit_card')
+        = sprite_icon('credit-card')
       %span.nav-item-name
         = _("Billing")
     %ul.sidebar-sub-level-items.is-fly-out-only

ee/app/views/layouts/nav/sidebar/_profile_usage_quotas_link.html.haml

 = nav_link(controller: :usage_quotas) do
   = link_to profile_usage_quotas_path do
     .nav-icon-container
-      = custom_icon('pipeline')
+      = sprite_icon('pipeline')
     %span.nav-item-name
       = s_('UsageQuota|Usage Quotas')
   %ul.sidebar-sub-level-items.is-fly-out-only

spec/features/projects/pipelines/pipeline_spec.rb

@@ -7,7 +7,8 @@ RSpec.describe 'Pipeline', :js do
   include ProjectForksHelper
   include ::ExclusiveLeaseHelpers
 
-  let(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
+
   let(:user) { create(:user) }
   let(:role) { :developer }
 
@@ -59,8 +60,9 @@ RSpec.describe 'Pipeline', :js do
   describe 'GET /:project/-/pipelines/:id' do
     include_context 'pipeline builds'
 
-    let(:group) { create(:group) }
-    let(:project) { create(:project, :repository, group: group) }
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project, reload: true) { create(:project, :repository, group: group) }
+
     let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id, user: user) }
 
     subject(:visit_pipeline) { visit project_pipeline_path(project, pipeline) }
@@ -246,6 +248,8 @@ RSpec.describe 'Pipeline', :js do
       end
 
       context 'when pipeline has a delayed job' do
+        let(:project) { create(:project, :repository, group: group) }
+
         it 'shows the scheduled icon and an unschedule action for the delayed job' do
           page.within('#ci-badge-delayed-job') do
             expect(page).to have_selector('.js-ci-status-icon-scheduled')
@@ -550,6 +554,7 @@ RSpec.describe 'Pipeline', :js do
     end
 
     context 'when pipeline is merge request pipeline' do
+      let(:project) { create(:project, :repository, group: group) }
       let(:source_project) { project }
       let(:target_project) { project }
 
@@ -634,7 +639,8 @@ RSpec.describe 'Pipeline', :js do
     describe 'GET /:project/-/pipelines/:id' do
       include_context 'pipeline builds'
 
-      let(:project) { create(:project, :repository) }
+      let_it_be(:project) { create(:project, :repository) }
+
       let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id, user: user) }
 
       before do
@@ -997,7 +1003,8 @@ RSpec.describe 'Pipeline', :js do
   describe 'GET /:project/-/pipelines/:id/builds' do
     include_context 'pipeline builds'
 
-    let(:project) { create(:project, :repository) }
+    let_it_be(:project) { create(:project, :repository) }
+
     let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) }
 
     before do
@@ -1234,7 +1241,8 @@ RSpec.describe 'Pipeline', :js do
   describe 'GET /:project/-/pipelines/:id/dag' do
     include_context 'pipeline builds'
 
-    let(:project) { create(:project, :repository) }
+    let_it_be(:project) { create(:project, :repository) }
+
     let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) }
 
     before do
@@ -1263,7 +1271,7 @@ RSpec.describe 'Pipeline', :js do
   end
 
   context 'when user sees pipeline flags in a pipeline detail page' do
-    let(:project) { create(:project, :repository) }
+    let_it_be(:project) { create(:project, :repository) }
 
     context 'when pipeline is latest' do
       include_context 'pipeline builds'