Jacob Vosmaer bebe110dff Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller ...

Conflicts:
	lib/gitlab/workhorse.rb

2016-06-08 10:31:33 +02:00

..

assets

Merge branch '18080-project-header-alignment' into 'master'

2016-06-08 03:39:59 +00:00

controllers

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller

2016-06-08 10:31:33 +02:00

finders

Improve Issuable.order_labels_priority

2016-06-06 11:59:49 -05:00

helpers

Merge branch 'notification-dropdown-labels' into 'master'

2016-06-07 18:06:37 +00:00

mailers

New confirmation email 🔥

2016-05-25 16:56:06 -04:00

models

Merge branch 'notification-dropdown-labels' into 'master'

2016-06-07 18:06:37 +00:00

services

Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3

2016-06-07 10:27:27 +02:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch '18080-project-header-alignment' into 'master'

2016-06-08 03:39:59 +00:00

workers

Update repository_import_worker.rb

2016-06-02 21:48:27 -04:00