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
Léo-Paul Géneau
gitlab-ce
Commits
fad11dec
Commit
fad11dec
authored
Nov 20, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add MR reference to logs
parent
011558ea
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+5
-5
No files found.
app/services/merge_requests/merge_service.rb
View file @
fad11dec
...
...
@@ -94,6 +94,11 @@ module MergeRequests
@merge_request
.
update
(
merge_error:
log_message
)
if
save_message_on_model
end
def
log_info
(
message
)
@logger
||=
Rails
.
logger
@logger
.
info
(
"
#{
merge_request_info
}
-
#{
message
}
"
)
end
def
merge_request_info
merge_request
.
to_reference
(
full:
true
)
end
...
...
@@ -101,10 +106,5 @@ module MergeRequests
def
find_merge_source
merge_request
.
diff_head_sha
end
def
log_info
(
message
)
@logger
||=
Rails
.
logger
@logger
.
info
(
message
)
end
end
end
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