diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-01 17:46:37 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-12 15:23:59 +0100 |
| commit | be3777f77857707ad19358c837703d3690b89256 (patch) | |
| tree | 40fb43008f52e905eccf09a357d765b94d6a7945 /app/services/files | |
| parent | bb627b6fc24d71a0ee19fd35d987e423a2567c48 (diff) | |
| download | gitlab-ce-be3777f77857707ad19358c837703d3690b89256.tar.gz | |
successfully adds the new version with the updated name on the projects repo
Diffstat (limited to 'app/services/files')
| -rw-r--r-- | app/services/files/base_service.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 37c5e321b39..9abee4e349a 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,12 @@ module Files params[:file_content] end +<<<<<<< bb627b6fc24d71a0ee19fd35d987e423a2567c48 +======= + puts @file_path + + # Validate parameters +>>>>>>> successfully adds the new version with the updated name on the projects repo validate # Create new branch if it different from source_branch |