Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master ...

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

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb

2014-12-05 13:28:32 +02:00

..

files

Merge branch '7-4-stable' into ee_stable

2014-10-21 13:48:16 +03:00

issues

Merge pull request #7967 from Bugagazavr/issue-actor

2014-11-05 12:10:50 +02:00

merge_requests

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

milestones

Merge branch 'group_milestones' into 'master'

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

notes

Remove NotesObserver

2014-06-17 22:09:01 +03:00

projects

Dont allow project creation without repository

2014-11-29 21:34:18 +02: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

Factor abilities methods

2014-10-19 11:12:39 +02:00

compare_service.rb

Comment typo.

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

create_branch_service.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

create_tag_service.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

delete_branch_service.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

event_create_service.rb

Use EventCreateService for notes, merge requests

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

git_push_service.rb

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

git_tag_push_service.rb

Create event and clear cache on new trag push

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

gravatar_service.rb

Move gravatar url compose to separate service

2014-06-13 17:11:46 +03:00

issuable_base_service.rb

Factor issue and merge request services

2014-10-07 21:12:18 +02:00

ldap_group_reset_service.rb

Fix EE code after membership refactoring

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

notification_service.rb

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +02:00

system_hooks_service.rb

Merge pull request #7495 from polamjag/fix-date-format-on-system-hook

2014-11-05 13:14:26 +02:00

test_hook_service.rb

Handle web hook exception

2014-12-04 15:07:01 +02:00