BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
08066059
Unverified
Commit
08066059
authored
Aug 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix adding new file to empty repo"
This reverts commit
27a15850
. Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
815e678c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Gemfile.lock
Gemfile.lock
+4
-0
create_service.rb
app/services/files/create_service.rb
+1
-1
No files found.
Gemfile.lock
View file @
08066059
...
...
@@ -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)
...
...
app/services/files/create_service.rb
View file @
08066059
...
...
@@ -42,7 +42,7 @@ module Files
params
[
:new_branch
]
)
else
created_successfull
y
=
repository
.
commit_file
(
created_successfull
=
repository
.
commit_file
(
current_user
,
file_path
,
params
[
:content
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment