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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
ef591b87
Commit
ef591b87
authored
8 years ago
by
Rubén Dávila
Committed by
Robert Speicher
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commit message plus other little fix.
parent
b0693318
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/models/commit.rb
app/models/commit.rb
+1
-1
app/models/repository.rb
app/models/repository.rb
+1
-2
No files found.
app/models/commit.rb
View file @
ef591b87
...
...
@@ -220,7 +220,7 @@ class Commit
end
def
revert_message
"Revert
\"
#{
safe_message
.
lines
.
first
}
\"
"
.
truncate
(
80
)
+
"
\n\n
Reverts
#{
to_reference
}
"
"Revert
\"
#{
safe_message
.
lines
.
first
.
chomp
}
\"
"
.
truncate
(
80
)
+
"
\n\n
Reverts
#{
to_reference
}
"
end
def
is_a_merge_commit?
...
...
This diff is collapsed.
Click to expand it.
app/models/repository.rb
View file @
ef591b87
...
...
@@ -628,8 +628,7 @@ class Repository
target_sha
=
find_branch
(
target_branch
).
try
(
:target
)
# First make revert in temp branch
rm_branch
(
user
,
target_branch
)
if
target_sha
success
=
revert_commit
(
user
,
commit
,
target_branch
,
base_branch
)
success
=
target_sha
?
true
:
revert_commit
(
user
,
commit
,
target_branch
,
base_branch
)
# Make the revert happen in the target branch
source_sha
=
find_branch
(
target_branch
).
target
...
...
This diff is collapsed.
Click to expand it.
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