Find a file
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
.github
.gitlab Encourage bug reporters to mention if they use GitLab.com [ci skip] 2016-12-06 16:08:53 +00:00
app Merge branch 'issue_24020' into 'master' 2016-12-09 22:49:08 +00:00
bin Simplify branch_name in bin/changelog 2016-12-02 18:31:57 +08:00
builds
changelogs Merge branch 'issue_24020' into 'master' 2016-12-09 22:49:08 +00:00
config Merge branch 'rs-filter-authentication_token' into 'security' 2016-12-08 21:23:09 -03:00
db Add nested groups support on data level 2016-12-08 11:47:16 +02:00
doc [ci skip] Update "Installation from source" guide for 8.15.0 2016-12-09 15:28:41 -02:00
docker
features Group links spec update 2016-12-09 16:39:00 +00:00
fixtures/emojis
generator_templates
lib Merge branch 'api-remove-source-branch' into 'master' 2016-12-09 13:39:53 +00:00
log
public Fix appearance in error pages 2016-11-29 11:44:07 -07:00
rubocop
scripts Use --extended-regexp in lint-doc for compatibility with Darwin grep 2016-12-06 15:46:48 +11:00
shared
spec Merge branch 'issue_24020' into 'master' 2016-12-09 22:49:08 +00:00
tmp
vendor
.csscomb.json
.eslintignore Remove JSX/React eslint plugins. 2016-11-29 16:15:47 +00:00
.eslintrc Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists 2016-12-02 10:19:31 +01:00
.flayignore
.foreman
.gitattributes
.gitignore
.gitlab-ci.yml Run builds with runners with tags gitlab-org and 2gb 2016-12-06 15:07:02 +01:00
.haml-lint.yml
.mailmap
.pkgr.yml
.rspec
.rubocop.yml
.rubocop_todo.yml
.ruby-version Bump ruby version 2016-12-03 15:57:20 +01:00
.scss-lint.yml Enable ColorVariable in scss-lint 2016-12-01 20:22:51 -05:00
CHANGELOG.md Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items 2016-12-09 11:58:12 +01:00
config.ru
CONTRIBUTING.md
doc_styleguide.md
docker-compose.yml
Gemfile Update factory_girl_rails to 4.7.0 2016-12-08 17:30:07 +11:00
Gemfile.lock Update factory_girl_rails to 4.7.0 2016-12-08 17:30:07 +11:00
GITLAB_SHELL_VERSION Bump gitlab-shell version to 4.0.3 2016-12-06 10:31:56 -05:00
GITLAB_WORKHORSE_VERSION Use gitlab-workhose 1.1.1 2016-12-08 11:53:21 +01:00
LICENSE
MAINTENANCE.md
package.json Remove JSX/React eslint plugins. 2016-11-29 16:15:47 +00:00
PROCESS.md
Procfile
Rakefile
README.md Bump Git version requirement to 2.8.4 2016-12-01 16:18:09 +01:00
VERSION

GitLab

Build status CE coverage report Code Climate Core Infrastructure Initiative Best Practices

Canonical source

The canonical source of GitLab Community Edition is hosted on GitLab.com.

Open source software to collaborate on code

To see how GitLab looks please see the features page on our website.

  • Manage Git repositories with fine grained access controls that keep your code secure
  • Perform code reviews and enhance collaboration with merge requests
  • Each project can also have an issue tracker and a wiki
  • Used by more than 100,000 organizations, GitLab is the most popular solution to manage Git repositories on-premises
  • Completely free and open source (MIT Expat license)
  • Powered by Ruby on Rails

Hiring

We're hiring developers, support people, and production engineers all the time, please see our jobs page.

Editions

There are two editions of GitLab:

  • GitLab Community Edition (CE) is available freely under the MIT Expat license.
  • GitLab Enterprise Edition (EE) includes extra features that are more useful for organizations with more than 100 users. To use EE and get official support please become a subscriber.

Website

On about.gitlab.com you can find more information about:

Requirements

Please see the requirements documentation for system requirements and more information about the supported operating systems.

Installation

The recommended way to install GitLab is with the Omnibus packages on our package server. Compared to an installation from source, this is faster and less error prone. Just select your operating system, download the respective package (Debian or RPM) and install it using the system's package manager.

There are various other options to install GitLab, please refer to the installation page on the GitLab website for more information.

You can access a new installation with the login root and password 5iveL!fe, after login you are required to set a unique password.

Contributing

GitLab is an open source project and we are very happy to accept community contributions. Please refer to CONTRIBUTING.md for details.

Install a development environment

To work on GitLab itself, we recommend setting up your development environment with the GitLab Development Kit. If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone. One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:

cp config/unicorn.rb.example.development config/unicorn.rb

Instructions on how to start GitLab and how to run the tests can be found in the development section of the GitLab Development Kit.

Software stack

GitLab is a Ruby on Rails application that runs on the following software:

  • Ubuntu/Debian/CentOS/RHEL
  • Ruby (MRI) 2.3
  • Git 2.8.4+
  • Redis 2.8+
  • MySQL or PostgreSQL

For more information please see the architecture documentation.

UX design

Please adhere to the UX Guide when creating designs and implementing code.

Third-party applications

There are a lot of third-party applications integrating with GitLab. These include GUI Git clients, mobile applications and API wrappers for various languages.

GitLab release cycle

For more information about the release process see the release documentation.

Upgrading

For upgrading information please see our update page.

Documentation

All documentation can be found on docs.gitlab.com/ce/.

Getting help

Please see Getting help for GitLab on our website for the many options to get help.

Is it any good?

Yes

Is it awesome?

Thanks for asking this question Joshua. These people seem to like it.