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
83417865
Commit
83417865
authored
Aug 21, 2017
by
Saverio Miroddi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change a variable name in Commit#cherry_pick_description
parent
9ec358af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/models/commit.rb
app/models/commit.rb
+4
-4
No files found.
app/models/commit.rb
View file @
83417865
...
...
@@ -252,21 +252,21 @@ class Commit
end
def
cherry_pick_description
(
user
)
message_b
uffer
=
"(cherry picked from commit
#{
sha
}
)"
message_b
ody
=
"(cherry picked from commit
#{
sha
}
)"
if
merged_merge_request?
(
user
)
commits_in_merge_request
=
merged_merge_request
(
user
).
commits
if
commits_in_merge_request
.
present?
message_b
uffer
<<
"
\n
"
message_b
ody
<<
"
\n
"
commits_in_merge_request
.
reverse
.
each
do
|
commit_in_merge
|
message_b
uffer
<<
"
\n
#{
commit_in_merge
.
short_id
}
#{
commit_in_merge
.
title
}
"
message_b
ody
<<
"
\n
#{
commit_in_merge
.
short_id
}
#{
commit_in_merge
.
title
}
"
end
end
end
message_b
uffer
message_b
ody
end
def
cherry_pick_message
(
user
)
...
...
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