Merge branch 'master' of github.com:jackbot/gitlabhq

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