diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-08-24 14:30:39 +0100 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-09-09 23:05:30 -0400 |
| commit | 08dc8af7339828852ae8596aeea577f9551d399d (patch) | |
| tree | 04318881b9fe92f55e91e69c35489e6cc561ac15 /app/models/repository.rb | |
| parent | d01cbe0c8baf0ab630cf5e5d28087e91c8679b70 (diff) | |
| download | gitlab-ce-08dc8af7339828852ae8596aeea577f9551d399d.tar.gz | |
fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-files
refactors update file
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 7b7090b8a73..37fbdcfe1c6 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -813,7 +813,7 @@ class Repository update: true } - if previous_path + unless previous_path == path || previous_path.blank? options[:file][:previous_path] = previous_path Gitlab::Git::Blob.rename(raw_repository, options) else |