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

905eb176 · Jack Weeden · b8eee565 · a5d6bbe0 · 905eb176 · 905eb176
Commit 905eb176 authored Jun 24, 2013 by Jack Weeden
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

db/fixtures/development/09_issues.rb db/fixtures/development/09_issues.rb +1 -1

db/fixtures/development/10_merge_requests.rb db/fixtures/development/10_merge_requests.rb +2 -1

No files found.
--- a/db/fixtures/development/09_issues.rb
+++ b/db/fixtures/development/09_issues.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,

--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -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,