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
d1acadce
Commit
d1acadce
authored
Oct 12, 2017
by
Micael Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a whitespace
parent
ba6f7699
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+1
-1
No files found.
app/services/merge_requests/merge_service.rb
View file @
d1acadce
...
@@ -73,7 +73,7 @@ module MergeRequests
...
@@ -73,7 +73,7 @@ module MergeRequests
def
branch_deletion_user
def
branch_deletion_user
@merge_request
.
force_remove_source_branch?
?
@merge_request
.
author
:
current_user
@merge_request
.
force_remove_source_branch?
?
@merge_request
.
author
:
current_user
end
end
# Verify again that the source branch can be removed, since branch may be protected,
# Verify again that the source branch can be removed, since branch may be protected,
# or the source branch may have been updated, or the user may not have permission
# or the source branch may have been updated, or the user may not have permission
#
#
...
...
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