diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-24 23:13:00 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-24 23:13:00 +0400 |
| commit | d41940d36ee8ff693a3c22d6c317e864b53792f0 (patch) | |
| tree | 60a0cf370682356e030eda6c6862cab3ea744ec0 /db | |
| parent | 106764ab3b42f9d81a6ad81f2611ea1d78d7ae05 (diff) | |
| parent | 884498c59f7083423eac7232091ff24215f4a0c7 (diff) | |
Merge branch 'master' into 6-0-dev
Conflicts:
app/views/projects/issues/show.html.haml
db/fixtures/development/09_issues.rb
db/fixtures/development/10_merge_requests.rb
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/09_issues.rb | 1 | ||||
| -rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb index 32c1139521f..627579721d0 100644 --- a/db/fixtures/development/09_issues.rb +++ b/db/fixtures/development/09_issues.rb @@ -11,6 +11,7 @@ Gitlab::Seeder.quiet do next unless user user_id = user.id + 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 0a9f986818f..0a8d67d4461 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -17,6 +17,8 @@ Gitlab::Seeder.quiet do next if branches.uniq.size < 2 user_id = user.id + Thread.current[:current_user] = user + MergeRequest.seed(:id, [{ id: i, source_branch: branches.first, |