diff options
| author | Jan-Gerd Tenberge <janten@gmail.com> | 2015-10-22 21:43:17 +0200 |
|---|---|---|
| committer | Jan-Gerd Tenberge <janten@gmail.com> | 2015-10-22 21:43:17 +0200 |
| commit | b5c19bcc4d02fd498bc95d70c39bd88ec9cdda4b (patch) | |
| tree | 6eaed47ca3b65dbd622813497b18902666d23d68 /spec/models/commit_spec.rb | |
| parent | b32bb377993fb0224ed3bd9294d752d1a82b2ef9 (diff) | |
| parent | a7174efaec77e9408900336b5941d9cca1f82ccf (diff) | |
| download | gitlab-ce-b5c19bcc4d02fd498bc95d70c39bd88ec9cdda4b.tar.gz | |
Fix merge error
Diffstat (limited to 'spec/models/commit_spec.rb')
| -rw-r--r-- | spec/models/commit_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index e303a97e6b5..90be9324951 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -89,9 +89,9 @@ eos end it_behaves_like 'a mentionable' do - subject { commit } + subject { create(:project).commit } - let(:author) { create(:user, email: commit.author_email) } + let(:author) { create(:user, email: subject.author_email) } let(:backref_text) { "commit #{subject.id}" } let(:set_mentionable_text) do ->(txt) { allow(subject).to receive(:safe_message).and_return(txt) } |