Douwe Maan 9413d1c2e9 Merge branch 'master' into 13948-access-request-to-projects-and-groups ...

# Conflicts:
#	app/views/layouts/nav/_project.html.haml

2016-06-14 16:23:16 +02:00

..

assets

Merge branch 'master' into 13948-access-request-to-projects-and-groups

2016-06-14 16:23:16 +02:00

controllers

Merge branch 'master' into 13948-access-request-to-projects-and-groups

2016-06-14 16:23:16 +02:00

finders

Project members with guest role can't access confidential issues

2016-06-13 19:32:00 -03:00

helpers

Merge branch 'master' into 13948-access-request-to-projects-and-groups

2016-06-14 16:23:16 +02:00

mailers

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

models

Merge branch 'master' into 13948-access-request-to-projects-and-groups

2016-06-14 16:23:16 +02:00

services

UI and copywriting improvements

2016-06-14 13:18:14 +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 'master' into 13948-access-request-to-projects-and-groups

2016-06-14 16:23:16 +02:00

workers

Test ExpireBuildArtifactsWorker

2016-06-13 11:07:23 +01:00