Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

2015-03-02 16:10:12 -08:00

..

files

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

issues

Add labels notes

2015-02-08 22:35:41 +06:00

merge_requests

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

milestones

Merge branch 'group_milestones' into 'master'

2014-07-01 07:18:15 +00:00

notes

Put the call for external tracker mention in the same place as gitlab default mention. Add git push service spec.

2015-02-06 10:31:00 -08:00

oauth2

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

projects

Merge branch 'autocomplete-mention-count' into 'master'

2015-02-27 07:08:23 +00:00

search

Adding in snippet search functionality

2014-08-29 15:32:07 -04:00

archive_repository_service.rb

Fix repository archive

2014-08-13 21:28:22 +03:00

audit_event_service.rb

Move event creation to service.

2014-11-21 12:32:12 +01:00

base_service.rb

Improve error messages when file editing fails

2015-02-22 16:01:49 -07:00

compare_service.rb

Comment typo.

2014-08-29 20:11:57 +02:00

create_branch_service.rb

Move all event creation to EventCreateService.

2015-02-13 12:02:58 +01:00

create_tag_service.rb

Move all event creation to EventCreateService.

2015-02-13 12:02:58 +01:00

delete_branch_service.rb

Move all event creation to EventCreateService.

2015-02-13 12:02:58 +01:00

event_create_service.rb

Add "User created project Namespace / Project" event

2015-02-13 12:02:58 +01:00

git_push_service.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

git_tag_push_service.rb

Move all event creation to EventCreateService.

2015-02-13 12:02:58 +01:00

gravatar_service.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

issuable_base_service.rb

Add labels notes

2015-02-08 22:35:41 +06:00

ldap_group_reset_service.rb

Fix EE code after membership refactoring

2014-10-03 14:09:07 +03:00

notification_service.rb

Add issue/mr participants to reasign events

2015-01-25 20:31:02 -08:00

system_hooks_service.rb

Added support for firing system hooks on group create/destroy and adding/removing users to group.

2015-01-27 09:25:28 +02:00

test_hook_service.rb

Fix test hook and tests

2015-01-12 09:08:25 -08:00