kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/assets/javascripts
History
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
..
behaviors explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
blob Do nothing if file is undefined 2016-12-07 12:58:23 -05:00
blob_edit explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
boards rewrite subscription javascript to accomodate new design 2016-11-30 17:15:25 -06:00
commit explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
cycle_analytics Show dashes when date is empty 2016-11-28 11:13:17 -05:00
diff_notes Fixed resolved discussion timeago not rendering 2016-11-22 11:47:26 +00:00
environments Changes after review 2016-12-09 10:14:49 +00:00
extensions Improvements after review 2016-11-30 17:06:48 +00:00
graphs explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
lib Fixed timeago re-rendering every element 2016-12-07 12:44:47 +00:00
merge_conflicts Fix Merge Conflicts app to make it work with Vue 2 2016-11-10 17:53:34 +03:00
network explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
profile showing unconfirmed email status in profile 2016-11-21 13:25:46 +06:00
protected_branches disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
snippet explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
templates disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
u2f explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
users Merge branch 'disable-calendar-deselection' into 'master' 2016-11-22 21:31:08 +00:00
vue_common_component Changes after review 2016-12-09 10:14:49 +00:00
abuse_reports.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
activities.js.es6 clean up globals exemptions within .eslintrc 2016-11-22 12:19:51 -06:00
admin.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
api.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
application.js Clean up common_utils.js (!7318) 2016-12-01 23:16:09 +01:00
aside.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
autosave.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
awards_handler.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
breakpoints.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
broadcast_message.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
build.js Improve name of build log state data attribute 2016-11-22 14:48:14 +01:00
build_artifacts.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
build_variables.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
commit.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
commits.js Fixed commit time not rendering after initial page load 2016-11-23 19:24:51 +00:00
compare.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
compare_autocomplete.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
confirm_danger_modal.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
copy_to_clipboard.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
create_label.js.es6 Creates new list from a new label 2016-11-04 10:25:47 +00:00
diff.js.es6 satisfy eslint no-param-reassign rule 2016-12-02 17:43:20 -06:00
dispatcher.js.es6 Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' 2016-12-09 09:17:41 +00:00
dropzone_input.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
due_date_select.js.es6 Add a starting date to milestones 2016-11-23 13:41:04 +02:00
files_comment_button.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
flash.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
gfm_auto_complete.js.es6 Clean up common_utils.js (!7318) 2016-12-01 23:16:09 +01:00
gl_dropdown.js Updated members dropdowns 2016-12-07 15:27:14 +00:00
gl_field_error.js.es6 Move snake_case to camelCase. 2016-11-02 11:37:35 +01:00
gl_field_errors.js.es6 List gl_field_error as gl_field_errors dep. 2016-11-01 18:40:48 +01:00
gl_form.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
group_avatar.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
group_label_subscription.js.es6 Fix label subscription menu on small screens resolution 2016-11-17 15:10:13 -02:00
groups_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
header.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
importer_status.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
issuable.js.es6 implements reset incoming email token on issues modal and account page, 2016-11-07 15:56:18 +00:00
issuable_context.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
issuable_form.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
issue.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
issue_status_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
issues_bulk_assignment.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
label_manager.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
labels.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
labels_select.js Remove JSX/React eslint plugins. 2016-11-29 16:15:47 +00:00
layout_nav.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
line_highlighter.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
logo.js clean up globals exemptions within .eslintrc 2016-11-22 12:19:51 -06:00
member_expiration_date.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
members.js.es6 Updated JS based on review 2016-12-09 10:06:02 +00:00
merge_request.js refactor MergeRequestTabs to es6 class syntax 2016-12-02 17:32:37 -06:00
merge_request_tabs.js.es6 Satisfied eslint 2016-12-03 23:04:21 +01:00
merge_request_widget.js.es6 fix display hook error message 2016-12-05 22:02:45 +09:00
merged_buttons.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
milestone.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
milestone_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
namespace_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
new_branch_form.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
new_commit_form.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
notes.js Remove JSX/React eslint plugins. 2016-11-29 16:15:47 +00:00
notifications_dropdown.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
notifications_form.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
pager.js.es6 fix some code style issues according to feedback 2016-11-21 10:17:11 -06:00
pipelines.js.es6 Improvements after review 2016-11-30 17:06:48 +00:00
preview_markdown.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_avatar.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_find_file.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_fork.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_import.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_label_subscription.js.es6 Avoid code duplication for label subscription status on label partial 2016-11-17 15:10:13 -02:00
project_new.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_show.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
project_variables.js.es6 Enable ESLint and fix minor code style stuff in project_variables.js.es6. 2016-11-29 01:15:23 +03:00
projects_list.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
right_sidebar.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
search.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
search_autocomplete.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
shortcuts.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
shortcuts_blob.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
shortcuts_dashboard_navigation.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
shortcuts_find_file.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
shortcuts_issuable.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
shortcuts_navigation.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
shortcuts_network.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
sidebar.js.es6 Merge branch 'add-todo-toggle-event' into 'master' 2016-10-27 13:28:40 +00:00
signin_tabs_memoizer.js.es6 Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists 2016-12-02 10:19:31 +01:00
single_file_diff.js re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" 2016-12-02 17:38:58 -06:00
smart_interval.js.es6 Backport SmartInterval, PrettyTime, SubbableResource from EE. 2016-11-18 16:49:40 +01:00
snippets_list.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
star.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
subbable_resource.js.es6 Backport SmartInterval, PrettyTime, SubbableResource from EE. 2016-11-18 16:49:40 +01:00
subscription.js.es6 remove selector string option from Subscription constructor 2016-12-01 00:14:12 -06:00
subscription_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
syntax_highlight.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
todos.js.es6 Merge branch 'add-todo-toggle-event' into 'master' 2016-10-27 13:28:40 +00:00
tree.js clean up globals exemptions within .eslintrc 2016-11-22 12:19:51 -06:00
user.js.es6 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
user_tabs.js.es6 convert activities.js to es6 class syntax 2016-11-20 01:32:20 -06:00
username_validator.js.es6 Unchange username_validator. 2016-11-02 11:40:32 +01:00
users_select.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
wikis.js.es6 rename event variable to just e 2016-11-30 15:22:43 -06:00
zen_mode.js explicitly disable eslint inline 2016-11-15 16:30:34 +00:00