home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix adding new file to empty repo"

Browse Source 
This reverts commit 27a158506e.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2015-08-11 11:51:26 +02:00
parent 815e678c4e
commit 0806605962
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+4
View File
@@ -783,11 +783,15 @@ DEPENDENCIES
gitlab-grack (~> 2.0.2)
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)
app/services/files/create_service.rb
+1 -1
View File
@@ -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],