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
Jérome Perrin
gitlab-ce
Commits
6eb65651
Commit
6eb65651
authored
Jul 07, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
We can't call private methods with `self.`
parent
ac26b237
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+5
-5
No files found.
app/models/merge_request_diff.rb
View file @
6eb65651
...
@@ -39,7 +39,7 @@ class MergeRequestDiff < ActiveRecord::Base
...
@@ -39,7 +39,7 @@ class MergeRequestDiff < ActiveRecord::Base
if
options
[
:ignore_whitespace_change
]
if
options
[
:ignore_whitespace_change
]
@diffs_no_whitespace
||=
begin
@diffs_no_whitespace
||=
begin
compare
=
Gitlab
::
Git
::
Compare
.
new
(
compare
=
Gitlab
::
Git
::
Compare
.
new
(
self
.
repository
.
raw_repository
,
repository
.
raw_repository
,
self
.
start_commit_sha
||
self
.
target_branch_sha
,
self
.
start_commit_sha
||
self
.
target_branch_sha
,
self
.
head_commit_sha
||
self
.
source_branch_sha
,
self
.
head_commit_sha
||
self
.
source_branch_sha
,
)
)
...
@@ -87,7 +87,7 @@ class MergeRequestDiff < ActiveRecord::Base
...
@@ -87,7 +87,7 @@ class MergeRequestDiff < ActiveRecord::Base
merge_request
.
fetch_ref
merge_request
.
fetch_ref
Gitlab
::
Git
::
Compare
.
new
(
Gitlab
::
Git
::
Compare
.
new
(
self
.
repository
.
raw_repository
,
repository
.
raw_repository
,
self
.
target_branch_sha
,
self
.
target_branch_sha
,
self
.
source_branch_sha
self
.
source_branch_sha
)
)
...
@@ -228,8 +228,8 @@ class MergeRequestDiff < ActiveRecord::Base
...
@@ -228,8 +228,8 @@ class MergeRequestDiff < ActiveRecord::Base
end
end
def
keep_around_commits
def
keep_around_commits
self
.
repository
.
keep_around
(
target_branch_sha
)
repository
.
keep_around
(
target_branch_sha
)
self
.
repository
.
keep_around
(
source_branch_sha
)
repository
.
keep_around
(
source_branch_sha
)
self
.
repository
.
keep_around
(
branch_base_sha
)
repository
.
keep_around
(
branch_base_sha
)
end
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