Add latest changes from gitlab-org/gitlab@master

spec/features/admin/admin_users_impersonation_tokens_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
       admin.update!(time_display_relative: false)
       visit admin_user_impersonation_tokens_path(user_id: user.username)
 
-      expect(active_impersonation_tokens).to have_text(personal_access_token.expires_at.strftime('%b %d'))
+      expect(active_impersonation_tokens).to have_text(personal_access_token.expires_at.strftime('%b %-d'))
     end
   end
 

spec/features/profiles/personal_access_tokens_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do
       it 'shows absolute times for expires_at' do
         visit profile_personal_access_tokens_path
 
-        expect(active_personal_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %d'))
+        expect(active_personal_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %-d'))
       end
     end
   end

spec/features/projects/settings/access_tokens_spec.rb

@@ -165,7 +165,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
       it 'shows absolute times for expires_at' do
         visit project_settings_access_tokens_path(project)
 
-        expect(active_project_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %d'))
+        expect(active_project_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %-d'))
       end
     end
   end

spec/support/shared_examples/features/deploy_token_shared_examples.rb

@@ -41,7 +41,7 @@ RSpec.shared_examples 'a deploy token in settings' do
       visit page_path
 
       within('.deploy-tokens') do
-        expect(page).to have_content(deploy_token.expires_at.strftime('%b %d'))
+        expect(page).to have_content(deploy_token.expires_at.strftime('%b %-d'))
       end
     end
   end