Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb

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

..

files

Add missing end in group.rb

2015-01-29 14:14:43 -08:00

issues

Add labels notes

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

merge_requests

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

2015-02-16 11:50:30 -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

Add "User created project Namespace / Project" event

2015-02-13 12:02:58 +01: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 application settings and write tests

2015-01-08 09:53:35 -08: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