Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +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 CE master into EE master

2014-11-13 17:05:12 +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

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03: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

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

Mentioned users are not limited by project scope any more

2014-10-30 13:26:45 +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

Prevent 500 if hook url is down, fixes #7376

2014-07-29 11:49:46 +02:00