diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-14 17:13:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-14 17:13:39 +0000 |
| commit | 0cf694fbf3c5b69689882a92b811cbc56d4bdb1c (patch) | |
| tree | 03f96e0f002226c9acddaff8ec573f898c929195 /app/models | |
| parent | feea9a0333510dae398ff79936020c7ac2e24c4e (diff) | |
| parent | 9e40baba1ebad260fa53b4a1de0c11e699d7c6a2 (diff) | |
| download | gitlab-ce-0cf694fbf3c5b69689882a92b811cbc56d4bdb1c.tar.gz | |
Merge branch 'gitlab-git-user' into 'master'
Rename Gitlab::Git::Committer to User
See merge request gitlab-org/gitlab-ce!14254
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 6ed33e0c268..f2b54705e7b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -172,7 +172,7 @@ class Repository end def add_branch(user, branch_name, ref) - branch = raw_repository.add_branch(branch_name, committer: user, target: ref) + branch = raw_repository.add_branch(branch_name, user: user, target: ref) after_create_branch @@ -182,7 +182,7 @@ class Repository end def add_tag(user, tag_name, target, message = nil) - raw_repository.add_tag(tag_name, committer: user, target: target, message: message) + raw_repository.add_tag(tag_name, user: user, target: target, message: message) rescue Gitlab::Git::Repository::InvalidRef false end @@ -190,7 +190,7 @@ class Repository def rm_branch(user, branch_name) before_remove_branch - raw_repository.rm_branch(branch_name, committer: user) + raw_repository.rm_branch(branch_name, user: user) after_remove_branch true @@ -199,7 +199,7 @@ class Repository def rm_tag(user, tag_name) before_remove_tag - raw_repository.rm_tag(tag_name, committer: user) + raw_repository.rm_tag(tag_name, user: user) after_remove_tag true |