summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-13 15:09:36 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-24 09:55:01 -0600
commit0625af3bcb75b3186a3286eee662a7ff8442f130 (patch)
treeb35fbb083efa3b5c39c8c154f02e38e0e5ee29c7 /db
parentfaaca5e191f9fe3894ad7587b42495fcbcab9328 (diff)
downloadgitlab-ce-0625af3bcb75b3186a3286eee662a7ff8442f130.tar.gz
Consistently create, update, and delete files, taking CRLF settings into account
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/17_cycle_analytics.rb10
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..647ed75b6d1 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.commit_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,