diff options
Diffstat (limited to 'app/services/files')
| -rw-r--r-- | app/services/files/base_service.rb | 6 | ||||
| -rw-r--r-- | app/services/files/multi_service.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 025f093a428..39e614d6569 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -7,8 +7,10 @@ module Files def initialize(*args) super - @author_email = params[:author_email] - @author_name = params[:author_name] + git_user = Gitlab::Git::User.from_gitlab(current_user) if current_user.present? + + @author_email = params[:author_email] || git_user&.email + @author_name = params[:author_name] || git_user&.name @commit_message = params[:commit_message] @last_commit_sha = params[:last_commit_sha] diff --git a/app/services/files/multi_service.rb b/app/services/files/multi_service.rb index 08088f8c592..c9d3ee31d82 100644 --- a/app/services/files/multi_service.rb +++ b/app/services/files/multi_service.rb @@ -2,7 +2,7 @@ module Files class MultiService < Files::BaseService - UPDATE_FILE_ACTIONS = %w(update move delete).freeze + UPDATE_FILE_ACTIONS = %w(update move delete chmod).freeze def create_commit! transformer = Lfs::FileTransformer.new(project, @branch_name) |