diff options
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/services/files/create_service.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7f8db0606e5..51d590778b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -784,10 +784,14 @@ DEPENDENCIES gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) <<<<<<< HEAD +<<<<<<< HEAD gitlab_git (~> 7.2.6) ======= gitlab_git (~> 7.2.2) >>>>>>> parent of dfccb06... Refactor web editor +======= + gitlab_git (~> 7.2.0) +>>>>>>> parent of 27a1585... Fix adding new file to empty repo gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb index 21065f71510..c0cf5956326 100644 --- a/app/services/files/create_service.rb +++ b/app/services/files/create_service.rb @@ -42,7 +42,7 @@ module Files params[:new_branch] ) else - created_successfully = repository.commit_file( + created_successfull = repository.commit_file( current_user, file_path, params[:content], |