James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import ...

# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb

2016-06-13 12:43:25 +02:00

..

assets

Center layout navigation and remove icons

2016-06-11 11:30:53 +03:00

controllers

Merge branch 'workhorse-helpers' into 'master'

2016-06-10 16:21:26 +00:00

finders

Improve Issuable.order_labels_priority

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

helpers

Add back sidebar counters and username

2016-06-10 12:39:58 -05:00

mailers

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

models

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

2016-06-13 12:43:25 +02:00

services

Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export

2016-06-13 09:22:33 +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

Center layout navigation and remove icons

2016-06-11 11:30:53 +03:00

workers

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

2016-06-13 12:43:25 +02:00