Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
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
Hide 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 @@ def diffs(options={})
if
options
[
:ignore_whitespace_change
]
@diffs_no_whitespace
||=
begin
compare
=
Gitlab
::
Git
::
Compare
.
new
(
self
.
repository
.
raw_repository
,
repository
.
raw_repository
,
self
.
start_commit_sha
||
self
.
target_branch_sha
,
self
.
head_commit_sha
||
self
.
source_branch_sha
,
)
...
...
@@ -87,7 +87,7 @@ def compare
merge_request
.
fetch_ref
Gitlab
::
Git
::
Compare
.
new
(
self
.
repository
.
raw_repository
,
repository
.
raw_repository
,
self
.
target_branch_sha
,
self
.
source_branch_sha
)
...
...
@@ -228,8 +228,8 @@ def update_columns_serialized(new_attributes)
end
def
keep_around_commits
self
.
repository
.
keep_around
(
target_branch_sha
)
self
.
repository
.
keep_around
(
source_branch_sha
)
self
.
repository
.
keep_around
(
branch_base_sha
)
repository
.
keep_around
(
target_branch_sha
)
repository
.
keep_around
(
source_branch_sha
)
repository
.
keep_around
(
branch_base_sha
)
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