Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 14 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_page_deletion_spec.rb b/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_page_deletion_spec.rb
index 626f9a7d593..fef6b8ad65f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_page_deletion_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_page_deletion_spec.rb
@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Create', product_group: :editor do
-    describe 'Testing project wiki'
-    let(:initial_wiki) { Resource::Wiki::ProjectPage.fabricate_via_api! }
+  RSpec.describe 'Create' do
+    describe 'Testing project wiki', product_group: :editor do
+      let(:initial_wiki) { Resource::Wiki::ProjectPage.fabricate_via_api! }
 
-    before do
-      Flow::Login.sign_in
-    end
+      before do
+        Flow::Login.sign_in
+      end
 
-    it 'can delete a page',
-  testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347815' do
-      initial_wiki.visit!
+      it 'can delete a page', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347815' do
+        initial_wiki.visit!
 
-      Page::Project::Wiki::Show.perform(&:click_edit)
-      Page::Project::Wiki::Edit.perform(&:delete_page)
+        Page::Project::Wiki::Show.perform(&:click_edit)
+        Page::Project::Wiki::Edit.perform(&:delete_page)
 
-      Page::Project::Wiki::Show.perform do |wiki|
-        expect(wiki).to have_no_page
+        Page::Project::Wiki::Show.perform do |wiki|
+          expect(wiki).to have_no_page
+        end
       end
     end
   end
diff --git a/spec/features/admin/users/users_spec.rb b/spec/features/admin/users/users_spec.rb
index 6f7fe312fa5..4da86821862 100644
--- a/spec/features/admin/users/users_spec.rb
+++ b/spec/features/admin/users/users_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe 'Admin::Users', feature_category: :user_management do
 
       expect(page).to have_content(current_user.email)
       expect(page).to have_content(current_user.name)
-      expect(page).to have_content(current_user.created_at.strftime('%b %e, %Y'))
+      expect(page).to have_content(current_user.created_at.strftime('%b %d, %Y'))
       expect(page).to have_content(user.email)
       expect(page).to have_content(user.name)
       expect(page).to have_content('Projects')