James Lopez 67f59ebd50 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator ...

# Conflicts:
#	spec/models/project_spec.rb

2016-06-30 14:37:48 +02:00

..

assets

Merge branch 'fix_filebrowser_reload' into 'master'

2016-06-30 00:49:54 +00:00

controllers

Add Application Setting to configure default Repository Path for new projects

2016-06-29 23:35:00 -04:00

finders

PipelinesFinder use git cached data

2016-06-29 07:10:58 +02:00

helpers

Add Application Setting to configure default Repository Path for new projects

2016-06-29 23:35:00 -04:00

mailers

Fallback to group's owners/masters when a project has none

2016-06-20 12:10:37 +02:00

models

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator

2016-06-30 14:37:48 +02:00

services

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

uploaders

Enable Style/SpaceAfterComma Rubocop cop

2016-06-29 15:23:44 +02:00

validators

few changes based on feedback

2016-06-30 13:17:37 +02:00

views

Merge branch 'shards' into 'master'

2016-06-30 11:02:43 +00:00

workers

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00