Alfredo Sumaran 3a66c2398a Merge branch 'issue_24020' into 'master' ... fix display hook error message ## What does this MR do? Fix hook error message display. ## Are there points in the code the reviewer needs to double check? Probably Hook will return the plain multi line text. It is better `pre` tag than `h4`. I thought of another good looking display, but I did not come up with it. 😓 ## Why was this MR needed? When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error. ## Screenshots (if relevant) When update hook returns an error like ``` XXXXXXXX YYYYYYYY ZZZZZZZZ ```  ## What are the relevant issue numbers? Closes #24020 See merge request !7775		2016-12-09 22:49:08 +00:00
..
.gitkeep
4269-public-api.yml
7749-add-setting-to-disable-html-emails.yml
15081-wrong-login-tab-ldap-frontend.yml	Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists	2016-12-02 10:19:31 +01:00
18546-update-wiki-page-design.yml
22373-reduce-queries-in-api-helpers-find_project.yml
22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install.yml
22781-user-generated-permalinks.yml
23305-leave-project-and-leave-group-should-be-buttons.yml
23500-enable-colorvariable.yml	Enable ColorVariable in scss-lint	2016-12-01 20:22:51 -05:00
23532-define-common-helper-for-describe-pagination-params-in-api.yml
23589-open-issue-for-mr.yml	Feature: delegate all open discussions to Issue	2016-12-05 20:55:45 +01:00
23718-backup-rake-task-human-readable.yml
24135-new-project-should-be-below-new-group-on-the-welcome-screen.yml
24150-consistent-dropdown-styles.yml
24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml
24413-show-unconfirmed-email-status.yml
24507_remove_deleted_branch_link_in_merge_request.yml	add link_to_if helper on target_branch link on Merge Request show page for case of deleted target branch	2016-12-08 01:06:23 +03:00
24576_cant_stop_impersonating.yml
24710-fix-generic-commit-status-table-row.yml
24726-remove-across-gitlab.yml	24726 Remove Across GitLab from side navigation	2016-12-01 13:45:14 -08:00
24733-archived-project-merge-request-count.yml	Fix Archived project merge requests add to group's Merge Requests	2016-12-05 18:06:36 +01:00
24844-environments-date.yml
24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml
24982-ux-improvement-sign-in-success-message.yml	fix: 24982- Remove'Signed in successfully' message	2016-12-07 20:30:28 +05:30
24999-fix-project-avatar-alignment.yml
25002-sentence-case-dashboard-tabs.yml
25011-hoverstates-for-collapsed-issue-merge-request-sidebar.yml
25026-authenticate-user-for-new-snippet.yml
25031-do-not-raise-error-in-autocomplete.yml
25098-header-margins-on-pipeline-settings.yml
25171-fix-mr-features-settings-hidden-when-builds-are-disabled.yml	Remove wrong '.builds-feature' class from the MR settings fieldset	2016-12-07 12:42:09 +01:00
25202-fix-mr-widget-content-wrapping.yml	Fixed MR widget content wrapping for XS viewports	2016-12-05 11:00:00 -05:00
25221-fix-build-status-overflow-mobile.yml	Added changelog for #25221	2016-12-03 19:21:04 -05:00
25251-actionview-template-error-undefined-method-text-for-nil-nilclass.yml	Fixes ActionView::Template::Error: undefined method text? for nil:NilClass	2016-12-02 14:03:30 +02:00
25264-ref-commit.yml	Adds changelog entry	2016-12-02 15:30:26 +00:00
25272_fix_comments_tab_disappearing.yml	remove unnecessary issues event filter on comments tab	2016-12-08 23:46:45 +03:00
25374-svg-as-prop.yml	Adds CHANGELOG entry	2016-12-09 10:14:48 +00:00
api-branch-status.yml
api-delete-group-share.yml
api-expose-commiter-details.yml
api-remove-source-branch.yml	API: Ability to remove source branch	2016-12-04 16:52:42 +01:00
cleanup-common_utils-js.yml	Clean up common_utils.js (!7318)	2016-12-01 23:16:09 +01:00
comments-fixture.yml
create-dynamic-fixture-for-build_spec.yml
destroy-session.yml	Merge branch 'destroy-session' into 'security'	2016-12-08 21:21:06 -03:00
dev-issue-24554.yml
do-not-refresh-main-when-fork-target-branch-updated.yml	Do not reload diff for merge request made from fork when target branch in fork is updated	2016-12-09 12:10:26 +01:00
dz-allow-nested-group-routing.yml
dz-nested-groups.yml	Add nested groups support on data level	2016-12-08 11:47:16 +02:00
emoji-btn-disabled.yml
enable-asciidoctor-admonition-icons.yml	Enable display of admonition icons in Asciidoc.	2016-12-08 08:46:22 +09:00
feature-admin-user-groups-link.yml	The admin user projects view now has a clickable group link	2016-12-02 15:18:47 +00:00
fix-cancelling-pipelines.yml
fix-create-pipeline-with-builds-in-transaction.yml
fix-drop-project-authorized-for-user.yml
fix-milestone-summary.yml	Add CHANGELOG entry	2016-12-08 17:09:26 -02:00
fix-rename-mwbs-to-merge-when-pipeline-succeeds.yml
glm-shorthand-reference.yml	Add shorthand support to gitlab markdown references	2016-12-02 19:18:17 -02:00
group-members-in-project-members-view.yml	Shows group members in the project members list	2016-12-02 16:49:53 +00:00
hoopes-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml
html-safe-diff-line-content.yml	Merge branch 'html-safe-diff-line-content' into 'security'	2016-12-08 21:38:35 -03:00
improve-invite-accept-page.yml
issuable_filters_present-refactor.yml
issue-24534.yml
issue-boards-scrollable-element.yml
issue-events-filter.yml	Add issue events filter and make sure "All" really shows everything	2016-12-04 23:07:22 +01:00
issue_24020.yml	fix display hook error message	2016-12-05 22:02:45 +09:00
issue_24363.yml
issue_24748.yml
issue_24958.yml
issues-1608-text.yml	change the date label to match the date used	2016-12-03 14:39:35 -07:00
jej-22869.yml
jej-23867-use-mr-finder-instead-of-access-check.yml	Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'	2016-12-08 21:42:07 -03:00
jej-fix-missing-access-check-on-issues.yml
jej-use-issuable-finder-instead-of-access-check.yml
members-dropdowns.yml	Updated members dropdowns	2016-12-07 15:27:14 +00:00
milestone_start_date.yml
move-abuse-report-spinach-test-to-rspec.yml
move-admin-abuse-report-spinach-test-to-rspec.yml
move-admin-hooks-spinach-test-to-rspec.yml	Move admin hooks spinach to rspec	2016-12-06 22:58:15 +05:00
move-admin-logs-spinach-test-to-rspec.yml	Move admin logs spinach test to rspec	2016-12-06 22:16:32 +05:00
move-admin-spam-spinach-test-to-rspec.yml
mr-origin-7855.yml	Added a changelog entry	2016-12-02 12:13:28 -05:00
post_receive-any-email.yml
public-tags-api.yml	Allow public access to some Tag API endpoints	2016-12-07 11:39:11 +01:00
readme-link-fix.yml
refactor-create-service-spec.yml
remove-backup-strategies.yml
remove-jsx-react-eslint-plugins.yml
remove-require-from-services.yml
remove-unnecessary-self-from-user-model.yml
removing_unnecessary_indexes.yml
render-svg-in-diffs-and-notes.yml	Render SVG as images in notes	2016-12-08 00:29:43 -02:00
repository-name-emojis
right-sidebar-fixture.yml
rs-project-team-helpers.yml
shortcuts-issuable-fixture.yml
simplify-create-new-list-issue-boards.yml
small-emoji-adjustments.yml	Various small emoji positioning adjustments	2016-12-08 14:35:17 +01:00
timeago-perf-fix.yml	Fixed timeago re-rendering every element	2016-12-07 12:44:47 +00:00
update-api-spec-files.yml
update-button-font-weight.yml	Updates the font weight of button styles because of the change to system fonts	2016-12-09 16:46:03 +01:00
update-git-version-in-doc.yml
use-st-commits-where-possible.yml
validate-state-param-when-filtering-issuables.yml	Merge branch 'issue_25064' into 'security'	2016-12-06 12:26:48 +11:00
zen-mode-fixture.yml
zj-expose-coverage-pipelines.yml
zj-fix-label-creation-non-members.yml
zj-guest-reads-public-builds.yml	Guests can read builds if those are public	2016-12-04 15:48:50 +01:00
zj-issue-new-over-issue-create.yml	Accept issue new as command to create an issue	2016-12-05 10:02:21 +01:00
zj-issue-search-slash-command.yml
zj-use-ruby-2-3-3.yml	Bump ruby version	2016-12-03 15:57:20 +01:00