diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-24 21:57:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-24 21:57:47 +0000 |
| commit | 6e2f2f5da7387c7813b23304f51e917596f2b170 (patch) | |
| tree | 5e56761cb271fd82f6bd6a77214fdef92d91a637 /db | |
| parent | 1f8d6c790a8493a341f1786710aac36621e93bf6 (diff) | |
| parent | 705f15587bfbfde33ae10f7820e66370a054ad5a (diff) | |
| download | gitlab-ce-6e2f2f5da7387c7813b23304f51e917596f2b170.tar.gz | |
Merge branch 'dm-fix-web-edit-new-lines' into 'master'
Consistently create, update, and delete files, taking CRLF settings into account
See merge request !9207
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index 747901dd634..aea0a72b633 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -155,17 +155,9 @@ class Gitlab::Seeder::CycleAnalytics issue.project.repository.add_branch(@user, branch_name, 'master') - options = { - committer: issue.project.repository.user_to_committer(@user), - author: issue.project.repository.user_to_committer(@user), - commit: { message: "Commit for ##{issue.iid}", branch: branch_name, update_ref: true }, - file: { content: "content", path: filename, update: false } - } - - commit_sha = Gitlab::Git::Blob.commit(issue.project.repository, options) + commit_sha = issue.project.repository.create_file(@user, filename, "content", options, message: "Commit for ##{issue.iid}", branch_name: branch_name) issue.project.repository.commit(commit_sha) - GitPushService.new(issue.project, @user, oldrev: issue.project.repository.commit("master").sha, |