Merge branch 'security-fix-user-email-tag-push-leak' into 'master'

[master] User email is visible in hook logs if they triggers tag push events

Closes #2775

See merge request gitlab/gitlabhq!2789

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/lib/gitlab/data_builder/push_spec.rb b/spec/lib/gitlab/data_builder/push_spec.rb
index befdc18d1aa..0c4decc6518 100644
--- a/spec/lib/gitlab/data_builder/push_spec.rb
+++ b/spec/lib/gitlab/data_builder/push_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::DataBuilder::Push do
   let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
+  let(:user) { build(:user, public_email: 'public-email@example.com') }
 
   describe '.build_sample' do
     let(:data) { described_class.build_sample(project, user) }
@@ -36,7 +36,7 @@ describe Gitlab::DataBuilder::Push do
     it { expect(data[:user_id]).to eq(user.id) }
     it { expect(data[:user_name]).to eq(user.name) }
     it { expect(data[:user_username]).to eq(user.username) }
-    it { expect(data[:user_email]).to eq(user.email) }
+    it { expect(data[:user_email]).to eq(user.public_email) }
     it { expect(data[:user_avatar]).to eq(user.avatar_url) }
     it { expect(data[:project_id]).to eq(project.id) }
     it { expect(data[:project]).to be_a(Hash) }