Download as
Browse Code »

Commit a324960d92d4c2436064329137857686d90100b5

Authored by Dmitriy Zaporozhets
2 parents b8eee565 905eb176
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4407 from jackbot/master 

Database seeding failing
Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
db/fixtures/development/09_issues.rb
  Diff comments   View file @a324960
@@ -11,7 +11,7 @@ Gitlab::Seeder.quiet do @@ -11,7 +11,7 @@ Gitlab::Seeder.quiet do
11 next unless user 11 next unless user
12 12
13 user_id = user.id 13 user_id = user.id
14 - IssueObserver.current_user = user 14 + Thread.current[:current_user] = user
15 15
16 Issue.seed(:id, [{ 16 Issue.seed(:id, [{
17 id: i, 17 id: i,
db/fixtures/development/10_merge_requests.rb
  Diff comments   View file @a324960
@@ -17,7 +17,8 @@ Gitlab::Seeder.quiet do @@ -17,7 +17,8 @@ Gitlab::Seeder.quiet do
17 next if branches.uniq.size < 2 17 next if branches.uniq.size < 2
18 18
19 user_id = user.id 19 user_id = user.id
20 - MergeRequestObserver.current_user = user 20 + Thread.current[:current_user] = user
  21 +
21 MergeRequest.seed(:id, [{ 22 MergeRequest.seed(:id, [{
22 id: i, 23 id: i,
23 source_branch: branches.first, 24 source_branch: branches.first,