summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-23 14:38:23 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-23 14:38:23 +0200
commit28e13634dc9318dbd093a4561ee8ea16e1d71460 (patch)
tree0a14694c45a8328fc9dbf868f310c5ba3a71184f /spec/workers
parent68590fddd860c5d840d8f04314ed11f0d02ddd44 (diff)
parent573f1f4ade80cc3b66723ad12594467e881b4510 (diff)
downloadgitlab-ce-28e13634dc9318dbd093a4561ee8ea16e1d71460.tar.gz
Merge branch 'improve/mr_diff'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/post_receive_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 0850734f136..e6bf79b853c 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -9,7 +9,7 @@ describe PostReceive do
end
context "web hook" do
- let(:project) { create(:project_with_code) }
+ let(:project) { create(:project) }
let(:key) { create(:key, user: project.owner) }
let(:key_id) { key.shell_id }