gitlab-org--gitlab-foss/app
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
```

![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png)

## What are the relevant issue numbers?

Closes #24020

See merge request !7775
2016-12-09 22:49:08 +00:00
..
assets Merge branch 'issue_24020' into 'master' 2016-12-09 22:49:08 +00:00
controllers Merge branch 'followup-7899' into 'master' 2016-12-09 17:59:29 +00:00
finders Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' 2016-12-08 21:42:07 -03:00
helpers Merge branch '25272_fix_comments_tab_disappearing' into 'master' 2016-12-09 13:28:42 +00:00
mailers Add new template to handle both commit & mr notes 2016-11-25 15:23:49 +00:00
models 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
policies Update effected tests 2016-12-04 17:32:33 +01:00
serializers Merge branch 'fix/ca-no-date' into 'master' 2016-11-30 10:01:56 +00:00
services 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
uploaders Render SVG as images in notes 2016-12-08 00:29:43 -02:00
validators
views Merge branch 'remove-your_email-gsub-in-help-page' into 'master' 2016-12-09 21:14:27 +00:00
workers Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' 2016-12-05 11:07:57 +00:00