Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-04-25 21:52:31 +0300
committerRegis <boudinot.regis@yahoo.com>2017-04-25 21:52:31 +0300
commitfee0c93244c6d32df501c0c93fe4be5553ee7dcb (patch)
tree6ea7e616cb8f1ff7a44cf8b456cc5ff4469f37cb /spec/features/task_lists_spec.rb
parentab7e59122437cbf64d731b6a27304d0f96dd2b2c (diff)
parentcc52dfab92116ca91fda37e07ad9cef21a62ce69 (diff)
fix merge conflict with issue_show haml
Diffstat (limited to 'spec/features/task_lists_spec.rb')
-rw-r--r--spec/features/task_lists_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 3c341fef253..3858f4d8959 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Task Lists', feature: true do
include Warden::Test::Helpers
- let(:project) { create(:project) }
+ let(:project) { create(:empty_project) }
let(:user) { create(:user) }
let(:user2) { create(:user) }
@@ -255,6 +255,7 @@ feature 'Task Lists', feature: true do
end
describe 'multiple tasks' do
+ let(:project) { create(:project, :repository) }
let!(:merge) { create(:merge_request, :simple, description: markdown, author: user, source_project: project) }
it 'renders for description' do