summaryrefslogtreecommitdiff
path: root/db/fixtures
diff options
context:
space:
mode:
authorJack Weeden <jack@ajack.org>2013-06-24 14:21:46 +0100
committerJack Weeden <jack@ajack.org>2013-06-24 14:21:46 +0100
commita5d6bbe0af50494cee2200537fd8b78d7e4841a6 (patch)
tree69f50798364d7fbf56b6a349349f9aba90e7201a /db/fixtures
parentac6c912860619aa8ae3229d07ff7c458481df791 (diff)
downloadgitlab-ce-a5d6bbe0af50494cee2200537fd8b78d7e4841a6.tar.gz
cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures
Diffstat (limited to 'db/fixtures')
-rw-r--r--db/fixtures/development/09_issues.rb2
-rw-r--r--db/fixtures/development/10_merge_requests.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb
index d13d520e3dd..627579721d0 100644
--- 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,
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index d122d96235e..0a8d67d4461 100644
--- 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,