-
- 下载
Merge branch 'new-merge-requests-commit-tab-active' into 'master'
MergeRequest new form load diff asynchronously ## What does this MR do? Don't return diff tab content from the server when request for a new merge request ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid 502 errors due to this controller action takes to much time ## What are the relevant issue numbers? Relates #13912 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5844
显示
- CHANGELOG 1 个添加, 0 个删除CHANGELOG
- app/assets/javascripts/lib/utils/common_utils.js 5 个添加, 0 个删除app/assets/javascripts/lib/utils/common_utils.js
- app/assets/javascripts/merge_request_tabs.js 18 个添加, 5 个删除app/assets/javascripts/merge_request_tabs.js
- app/controllers/projects/merge_requests_controller.rb 43 个添加, 23 个删除app/controllers/projects/merge_requests_controller.rb
- app/models/merge_request.rb 2 个添加, 2 个删除app/models/merge_request.rb
- app/views/projects/diffs/_diffs.html.haml 2 个添加, 1 个删除app/views/projects/diffs/_diffs.html.haml
- app/views/projects/merge_requests/_new_diffs.html.haml 1 个添加, 0 个删除app/views/projects/merge_requests/_new_diffs.html.haml
- app/views/projects/merge_requests/_new_submit.html.haml 13 个添加, 15 个删除app/views/projects/merge_requests/_new_submit.html.haml
- config/routes/project.rb 1 个添加, 0 个删除config/routes/project.rb
- features/project/source/browse_files.feature 11 个添加, 6 个删除features/project/source/browse_files.feature
- features/steps/project/source/browse_files.rb 4 个添加, 0 个删除features/steps/project/source/browse_files.rb
加载中
想要评论请 注册 或 登录