Commit 08066059 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Revert "Fix adding new file to empty repo"

This reverts commit 27a15850.
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 815e678c
...@@ -783,11 +783,15 @@ DEPENDENCIES ...@@ -783,11 +783,15 @@ DEPENDENCIES
gitlab-grack (~> 2.0.2) gitlab-grack (~> 2.0.2)
gitlab-linguist (~> 3.0.1) gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1) gitlab_emoji (~> 0.1)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
gitlab_git (~> 7.2.6) gitlab_git (~> 7.2.6)
======= =======
gitlab_git (~> 7.2.2) gitlab_git (~> 7.2.2)
>>>>>>> parent of dfccb06... Refactor web editor >>>>>>> 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_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.1) gitlab_omniauth-ldap (= 1.2.1)
gollum-lib (~> 4.0.2) gollum-lib (~> 4.0.2)
......
...@@ -42,7 +42,7 @@ module Files ...@@ -42,7 +42,7 @@ module Files
params[:new_branch] params[:new_branch]
) )
else else
created_successfully = repository.commit_file( created_successfull = repository.commit_file(
current_user, current_user,
file_path, file_path,
params[:content], params[:content],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment