diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 09:08:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 09:08:49 +0000 |
commit | 456a7247f9e88fc2518b69a1a00e905c6db6d775 (patch) | |
tree | 6235f3838cbf078d46de056442d9562ee4abbd74 /spec/features/signed_commits_spec.rb | |
parent | ddd268b03b6f35c68e5a89606dbfd516f72846fd (diff) | |
download | gitlab-ce-456a7247f9e88fc2518b69a1a00e905c6db6d775.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/signed_commits_spec.rb')
-rw-r--r-- | spec/features/signed_commits_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb index f56bd055224..851e155480b 100644 --- a/spec/features/signed_commits_spec.rb +++ b/spec/features/signed_commits_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe 'GPG signed commits' do let(:project) { create(:project, :public, :repository) } - it 'changes from unverified to verified when the user changes his email to match the gpg key', :sidekiq_might_not_need_inline do + it 'changes from unverified to verified when the user changes their email to match the gpg key', :sidekiq_might_not_need_inline do ref = GpgHelpers::SIGNED_AND_AUTHORED_SHA user = create(:user, email: 'unrelated.user@example.org') @@ -18,7 +18,7 @@ describe 'GPG signed commits' do expect(page).to have_button 'Unverified' expect(page).not_to have_button 'Verified' - # user changes his email which makes the gpg key verified + # user changes their email which makes the gpg key verified perform_enqueued_jobs do user.skip_reconfirmation! user.update!(email: GpgHelpers::User1.emails.first) |