Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ff059360
Commit
ff059360
authored
Jul 19, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes an issue cause by a bad merge
parent
5c69043e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/models/repository.rb
app/models/repository.rb
+2
-1
No files found.
app/models/repository.rb
View file @
ff059360
...
@@ -741,7 +741,8 @@ class Repository
...
@@ -741,7 +741,8 @@ class Repository
options
[
:author
]
=
committer
options
[
:author
]
=
committer
options
[
:commit
]
=
{
options
[
:commit
]
=
{
message:
message
,
message:
message
,
branch:
ref
branch:
ref
,
update_ref:
false
}
}
options
[
:file
]
=
{
options
[
:file
]
=
{
...
...
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