0

我的用户想要在我们托管的 GitLab EE 11.5.2 网站上合并请求。但网站返回500 Internal Server Error如下:

在此处输入图像描述

相关日志如下:

Completed 500 Internal Server Error in 56565ms (ActiveRecord: 746.1ms | Elasticsearch: 0.0ms)

ActionView::Template::Error (4:Deadline Exceeded):
  42:             %li.diffs-tab
  44:                 Changes
  45:                 %span.badge.badge-pill= @merge_request.diff_size
  46:
  47:     #diff-notes-app.tab-content
  48:       #new.commits.tab-pane.active
lib/gitlab/gitaly_client/diff_stitcher.rb:13:in `each'
lib/gitlab/gitaly_client/diff_stitcher.rb:13:in `each'
lib/gitlab/git/diff_collection.rb:107:in `each_gitaly_patch'
lib/gitlab/git/diff_collection.rb:47:in `each'
lib/gitlab/git/diff_collection.rb:83:in `each_with_index'
lib/gitlab/git/diff_collection.rb:83:in `decorate!'
lib/gitlab/diff/file_collection/base.rb:32:in `diff_files'
lib/gitlab/diff/file_collection/base.rb:9:in `real_size'
app/models/merge_request.rb:411:in `diff_size'
app/views/projects/merge_requests/creations/_new_submit.html.haml:45:in `block in _app_views_projects_merge_requests_creations__new_submit_html_haml__4084413277917201848_70167460469980'
app/views/projects/merge_requests/creations/_new_submit.html.haml:43:in `_app_views_projects_merge_requests_creations__new_submit_html_haml__4084413277917201848_70167460469980'
app/views/projects/merge_requests/creations/new.html.haml:6:in `_app_views_projects_merge_requests_creations_new_html_haml__4204914316377908944_70167458972060'
app/controllers/application_controller.rb:116:in `render'
lib/gitlab/i18n.rb:55:in `with_locale'
lib/gitlab/i18n.rb:61:in `with_user_locale'
app/controllers/application_controller.rb:427:in `set_locale'
lib/gitlab/middleware/multipart.rb:101:in `call'
lib/gitlab/request_profiler/middleware.rb:14:in `call'
ee/lib/gitlab/jira/middleware.rb:15:in `call'
lib/gitlab/middleware/go.rb:17:in `call'
lib/gitlab/etag_caching/middleware.rb:11:in `call'
lib/gitlab/middleware/rails_queue_duration.rb:22:in `call'
lib/gitlab/metrics/rack_middleware.rb:15:in `block in call'
lib/gitlab/metrics/transaction.rb:53:in `run'
lib/gitlab/metrics/rack_middleware.rb:15:in `call'
lib/gitlab/middleware/read_only/controller.rb:40:in `call'
lib/gitlab/middleware/read_only.rb:16:in `call'
lib/gitlab/middleware/basic_health_check.rb:25:in `call'
lib/gitlab/request_context.rb:20:in `call'
lib/gitlab/metrics/requests_rack_middleware.rb:27:in `call'
lib/gitlab/middleware/release_env.rb:10:in

你能告诉我如何解决这个问题吗?

谢谢你。

4

1 回答 1

3

最终,我们找到了解决方案!

虽然可以通过 git 命令实现合并请求,但我们的安全策略不建议这样做。

解决方案是合并请求应该通过“ Merge Requests ”而不是“ Repository > Branches ”来操作。

成功的方法: 在此处输入图像描述

失败的方式: 在此处输入图像描述

于 2021-07-14T02:26:23.587 回答