Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

files

Repository#blob_at_branch

2014-02-05 11:39:55 +02:00

issues

Move all Context classes into Services

2014-01-16 19:03:42 +02:00

merge_requests

MergeRequests services

2014-01-24 14:18:32 +02:00

notes

Move services for collecting items to Finders

2014-02-25 19:15:08 +02:00

projects

Add retry feature to project import

2014-03-12 19:26:09 +02:00

search

Remove confusing code

2014-03-14 14:43:50 +02:00

base_service.rb

Move all Context classes into Services

2014-01-16 19:03:42 +02:00

git_push_service.rb

Add email aliases for users

2014-02-13 22:59:39 -06:00

git_tag_push_service.rb

Create event and clear cache on new trag push

2014-03-13 11:37:13 +02:00

ldap_group_reset_service.rb

LdapGroupResetService added

2014-02-20 11:32:58 +02:00

notification_service.rb

Send emails from the author

2014-02-19 18:25:18 +01:00

project_transfer_service.rb

Correctly remove and re-create satellites when project transfer

2013-11-20 11:06:42 +02:00

system_hooks_service.rb

Use instance methods for system_hooks_service

2014-01-15 14:26:05 +02:00

test_hook_service.rb

Convert TestHookContext into TestHookService. Added tests

2014-01-15 14:38:50 +02:00