diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-01-24 18:42:12 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-25 12:25:42 -0500 |
| commit | 80a6d2fda2483bf81c4cf9cdac9aa3c9e42b7982 (patch) | |
| tree | 32d074259ee566098454cce7e44e69c8abca7fa8 /spec/lib/gitlab/conflict | |
| parent | 5f410001eb718e23835d933e66f4973bfd2b0a10 (diff) | |
| download | gitlab-ce-80a6d2fda2483bf81c4cf9cdac9aa3c9e42b7982.tar.gz | |
Use `:empty_project` where possible throughout spec/librs-empty_project-lib
Diffstat (limited to 'spec/lib/gitlab/conflict')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 648d342ecf8..fbf679c5215 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Gitlab::Conflict::File, lib: true do - let(:project) { create(:project) } + let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:rugged) { repository.rugged } let(:their_commit) { rugged.branches['conflict-start'].target } |