gitlab-org--gitlab-foss/spec
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
..
bin DRY up the specs for bin/changelog 2016-11-03 17:35:06 +00:00
config Make mail_room idle_timeout option configurable. 2016-11-16 12:46:37 +01:00
controllers Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' 2016-12-08 21:42:07 -03:00
factories Added Ci::Stage specs 2016-12-06 16:04:30 +01:00
features Merge branch 'remove-your_email-gsub-in-help-page' into 'master' 2016-12-09 21:14:27 +00:00
finders Merge branch '24733-archived-project-merge-request-count' into 'master' 2016-12-06 14:02:45 +00:00
fixtures adds impersonator variable and makes sudo usage overall more clear 2016-12-07 14:42:51 +00:00
helpers Merge branch 'html-safe-diff-line-content' into 'security' 2016-12-08 21:38:35 -03:00
initializers
javascripts Merge branch 'issue_24020' into 'master' 2016-12-09 22:49:08 +00:00
lib Merge branch 'dz-nested-groups' into 'master' 2016-12-09 01:52:36 +00:00
mailers Merge branch '24880-configurable-plaintext-emails' into 'master' 2016-11-29 12:05:23 +00:00
migrations Pass commit data to ProcessCommitWorker 2016-12-01 13:36:06 +01:00
models Merge branch 'dz-nested-groups' into 'master' 2016-12-09 01:52:36 +00:00
policies Update effected tests 2016-12-04 17:32:33 +01:00
requests Merge branch 'api-remove-source-branch' into 'master' 2016-12-09 13:39:53 +00:00
routing Add nested groups support to the routing 2016-11-23 14:08:36 +02: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
support Use :maximum instead of :within for length validators with a 0..N range 2016-12-06 10:23:17 +01:00
tasks/gitlab Don't allow to specify a repo or version when installing Workhorse 2016-12-01 19:22:46 +01:00
uploaders
views Prevent error when submitting a merge request and pipeline is not defined 2016-11-28 12:03:59 +01:00
workers Merge branch 'zj-guest-reads-public-builds' into 'master' 2016-12-06 13:54:16 +00:00
factories_spec.rb
rails_helper.rb
rake_helper.rb Move task helpers to a module 2016-11-30 12:20:21 +01:00
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Pass commit data to ProcessCommitWorker 2016-12-01 13:36:06 +01:00
teaspoon_env.rb