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
a44ca15c
Commit
a44ca15c
authored
Sep 25, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Error 500 in creating merge requests with > 1000 diffs
Closes #2692
parent
718817fd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+2
-2
No files found.
CHANGELOG
View file @
a44ca15c
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 8.1.0 (unreleased)
v 8.1.0 (unreleased)
- Fix Error 500 in creating merge requests with > 1000 diffs (Stan Hu)
- Show CI status on all pages where commits list is rendered
- Show CI status on all pages where commits list is rendered
- Automatically enable CI when push .gitlab-ci.yml file to repository
- Automatically enable CI when push .gitlab-ci.yml file to repository
- Move CI charts to project graphs area
- Move CI charts to project graphs area
...
...
app/models/merge_request_diff.rb
View file @
a44ca15c
...
@@ -123,12 +123,12 @@ class MergeRequestDiff < ActiveRecord::Base
...
@@ -123,12 +123,12 @@ class MergeRequestDiff < ActiveRecord::Base
if
new_diffs
.
any?
if
new_diffs
.
any?
if
new_diffs
.
size
>
Commit
::
DIFF_HARD_LIMIT_FILES
if
new_diffs
.
size
>
Commit
::
DIFF_HARD_LIMIT_FILES
self
.
state
=
:overflow_diff_files_limit
self
.
state
=
:overflow_diff_files_limit
new_diffs
=
new_diffs
.
first
[
Commit
::
DIFF_HARD_LIMIT_LINES
]
new_diffs
=
new_diffs
.
first
(
Commit
::
DIFF_HARD_LIMIT_LINES
)
end
end
if
new_diffs
.
sum
{
|
diff
|
diff
.
diff
.
lines
.
count
}
>
Commit
::
DIFF_HARD_LIMIT_LINES
if
new_diffs
.
sum
{
|
diff
|
diff
.
diff
.
lines
.
count
}
>
Commit
::
DIFF_HARD_LIMIT_LINES
self
.
state
=
:overflow_diff_lines_limit
self
.
state
=
:overflow_diff_lines_limit
new_diffs
=
new_diffs
.
first
[
Commit
::
DIFF_HARD_LIMIT_LINES
]
new_diffs
=
new_diffs
.
first
(
Commit
::
DIFF_HARD_LIMIT_LINES
)
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