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
5d2edfb9
Commit
5d2edfb9
authored
Sep 18, 2020
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused helper
parent
06c6774a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+0
-4
No files found.
app/helpers/merge_requests_helper.rb
View file @
5d2edfb9
...
@@ -109,10 +109,6 @@ module MergeRequestsHelper
...
@@ -109,10 +109,6 @@ module MergeRequestsHelper
@merge_request_diffs
.
size
-
@merge_request_diffs
.
index
(
merge_request_diff
)
@merge_request_diffs
.
size
-
@merge_request_diffs
.
index
(
merge_request_diff
)
end
end
def
different_base?
(
version1
,
version2
)
version1
&&
version2
&&
version1
.
base_commit_sha
!=
version2
.
base_commit_sha
end
def
merge_params
(
merge_request
)
def
merge_params
(
merge_request
)
{
{
auto_merge_strategy:
AutoMergeService
::
STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS
,
auto_merge_strategy:
AutoMergeService
::
STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS
,
...
...
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