-
- Downloads
Merge branch 'fix-huge-mr' into 'master'
Fix huge merge requests * Refactored suppress logic for diffs * Increase grit memory limit (should mix most of 502 errors when create MR) * show first 100 files for huge diffs Fixes #1424 See merge request !970
Showing
- app/assets/stylesheets/sections/commits.scss 3 additions, 1 deletionapp/assets/stylesheets/sections/commits.scss
- app/controllers/projects/commit_controller.rb 4 additions, 10 deletionsapp/controllers/projects/commit_controller.rb
- app/controllers/projects/compare_controller.rb 1 addition, 5 deletionsapp/controllers/projects/compare_controller.rb
- app/controllers/projects/merge_requests_controller.rb 21 additions, 55 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/helpers/diff_helper.rb 22 additions, 0 deletionsapp/helpers/diff_helper.rb
- app/helpers/projects_helper.rb 6 additions, 0 deletionsapp/helpers/projects_helper.rb
- app/models/commit.rb 2 additions, 25 deletionsapp/models/commit.rb
- app/models/merge_request.rb 5 additions, 0 deletionsapp/models/merge_request.rb
- app/services/merge_requests/build_service.rb 70 additions, 0 deletionsapp/services/merge_requests/build_service.rb
- app/views/projects/commit/huge_commit.html.haml 0 additions, 3 deletionsapp/views/projects/commit/huge_commit.html.haml
- app/views/projects/commit/show.html.haml 1 addition, 1 deletionapp/views/projects/commit/show.html.haml
- app/views/projects/commits/_diff_file.html.haml 48 additions, 0 deletionsapp/views/projects/commits/_diff_file.html.haml
- app/views/projects/commits/_diff_head.html.haml 0 additions, 26 deletionsapp/views/projects/commits/_diff_head.html.haml
- app/views/projects/commits/_diff_stats.html.haml 41 additions, 0 deletionsapp/views/projects/commits/_diff_stats.html.haml
- app/views/projects/commits/_diff_warning.html.haml 19 additions, 0 deletionsapp/views/projects/commits/_diff_warning.html.haml
- app/views/projects/commits/_diffs.html.haml 20 additions, 88 deletionsapp/views/projects/commits/_diffs.html.haml
- app/views/projects/commits/_text_file.html.haml 1 addition, 1 deletionapp/views/projects/commits/_text_file.html.haml
- app/views/projects/compare/show.html.haml 1 addition, 12 deletionsapp/views/projects/compare/show.html.haml
- app/views/projects/merge_requests/_new_compare.html.haml 3 additions, 3 deletionsapp/views/projects/merge_requests/_new_compare.html.haml
- app/views/projects/merge_requests/_new_submit.html.haml 66 additions, 66 deletionsapp/views/projects/merge_requests/_new_submit.html.haml
Loading
Please register or sign in to comment