Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"
What does this MR do?
This reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25708 which enabled displaying errors returned from pre-receive scripts.
The displaying of errors from pre-receive scripts had been previously prevented in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 due to security concerns. https://gitlab.com/gitlab-org/gitlab-ce/issues/48132 was opened because there was a need to safely display pre-receive script errors in the Rails UI. This has led to two MRs that are being reviewed gitaly!1101 (closed) and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25625 which are addressing the need to display errors returned from pre-receive scripts that are considered "safe".
The author of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25708 @stanhu suggested (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25708#note_146804826 https://gitlab.com/gitlab-org/gitlab-ce/issues/48132#note_146805075) that in meantime the MR could be reverted. After discussion with @DouweM it was decided that this was the best thing to do, until the MRs that address https://gitlab.com/gitlab-org/gitlab-ce/issues/48132 are reviewed and merged.
What are the relevant issue numbers?
- https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
- https://gitlab.com/gitlab-org/gitlab-ee/issues/10165
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
Security reports checked/validated by reviewer