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

..

assembla_service.rb

annotate

2014-10-09 18:22:20 +03:00

bamboo_service.rb

Add Atlassian Bamboo service

2014-10-28 05:20:36 -05:00

buildbox_service.rb

Explicitly require addressable gem feature you need. Fixes Buildbox CI integration

2014-10-29 16:48:25 +02:00

campfire_service.rb

annotate

2014-10-09 18:22:20 +03:00

ci_service.rb

annotate

2014-10-09 18:22:20 +03:00

emails_on_push_service.rb

annotate

2014-10-09 18:22:20 +03:00

flowdock_service.rb

Factor using Repository#path_to_repo

2014-11-05 17:51:49 +01:00

gemnasium_service.rb

Factor using Repository#path_to_repo

2014-11-05 17:51:49 +01:00

gitlab_ci_service.rb

Update GitLab CI service to work with new GitLab CI

2014-11-05 11:44:40 +02:00

hipchat_service.rb

annotate

2014-10-09 18:22:20 +03:00

jenkins_service.rb

Jenkins service: update parser

2014-11-07 19:36:29 +02:00

jira_service.rb

Complete serialization of service properties for EE

2014-09-11 05:44:00 -05:00

pivotaltracker_service.rb

annotate

2014-10-09 18:22:20 +03:00

pushover_service.rb

Add Pushover service integration

2014-10-03 13:54:37 +02:00

slack_message.rb

Improved Slack integration with message attachments.

2014-04-06 11:57:48 +02:00

slack_service.rb

update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation

2014-10-23 14:47:28 -04:00