Dmitriy Zaporozhets 5fb5fd253a Merge branch 'nicer-merge-conflicts-widget' into 'master' ...

Split merge conflict messages on 2 lines

Before

![Screenshot_2015-08-06_17.19.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a2757ca0a8f4acbf4152234e050b739e/Screenshot_2015-08-06_17.19.48.png)

After

![Screenshot_2015-08-06_17.22.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/11eeab533f98f008fb9548c0eb039aa3/Screenshot_2015-08-06_17.22.58.png)


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !1107

2015-08-06 20:35:36 +00:00

..

assets

Add project name to project head

2015-08-06 15:10:51 +02:00

controllers

Merge branch 'add-current-user-to-autocomplete' into 'master'

2015-08-06 16:10:38 +00:00

finders

Rename NoMilestone to Milestone::None

2015-07-06 22:39:55 -04:00

helpers

Show buttons to add license, changelog and contribution guide if they're missing.

2015-07-30 15:12:57 +02:00

mailers

Prefix EmailsOnPush email subject with [Git].

2015-05-25 16:35:37 +02:00

models

Merge branch 'fix-namespace-move-dir' into 'master'

2015-08-06 16:09:11 +00:00

services

Fix merge request creation without branch selected

2015-08-05 11:03:41 +02:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'nicer-merge-conflicts-widget' into 'master'

2015-08-06 20:35:36 +00:00

workers

Merge branch 'master' into drop-satellites

2015-08-04 16:42:36 +02:00