diff options
| author | Marc Siegfriedt <marc@techaccelerator.com> | 2016-08-29 23:58:32 +0000 |
|---|---|---|
| committer | Marc Siegfriedt <marc@techaccelerator.com> | 2016-10-05 17:42:52 +0000 |
| commit | a1ee8cf5ad07256807f15590bdb5f56152d55553 (patch) | |
| tree | 9f90bc8f0d3c5d65e9b8778bc9d80e4ecd8855dd /app/services/files/base_service.rb | |
| parent | 4bc27cd17b304abce01fad1fce56fce32a4ee099 (diff) | |
| download | gitlab-ce-a1ee8cf5ad07256807f15590bdb5f56152d55553.tar.gz | |
multi-file commit
add docs and tests - add additional validation
allow move without content
updated response
Diffstat (limited to 'app/services/files/base_service.rb')
| -rw-r--r-- | app/services/files/base_service.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index e8465729d06..9bd4bd464f7 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -27,8 +27,9 @@ module Files create_target_branch end - if commit - success + result = commit + if result + success(result: result) else error('Something went wrong. Your changes were not committed') end @@ -42,6 +43,12 @@ module Files @source_branch != @target_branch || @source_project != @project end + def file_has_changed? + return false unless @last_commit_sha && last_commit + + @last_commit_sha != last_commit.sha + end + def raise_error(message) raise ValidationError.new(message) end |