Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb

2015-01-29 11:34:43 -08:00

..

assembla_service.rb

annotate

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

bamboo_service.rb

Annotate models

2015-01-22 09:40:03 -08: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

Replace regex methods by string ones since faster

2014-12-28 23:53:27 +01:00

ci_service.rb

annotate

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

custom_issue_tracker_service.rb

Update new services with initialization based on existing data.

2015-01-23 09:14:45 -08: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

gitlab_issue_tracker_service.rb

Add a scope for visible services, code styling changes for easier readability.

2015-01-28 14:25:55 -08:00

hipchat_service.rb

Add placeholders to hipchat service

2015-01-17 18:06:43 +01:00

issue_tracker_service.rb

Build the urls inside of the service.

2015-01-28 13:19:32 -08:00

jenkins_service.rb

Jenkins service: update parser

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

jira_service.rb

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

2015-01-29 11:34:43 -08:00

pivotaltracker_service.rb

annotate

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

pushover_service.rb

Replace regex methods by string ones since faster

2014-12-28 23:53:27 +01:00

redmine_service.rb

Move repetition to the parent.

2015-01-26 16:24:11 -08:00

slack_message.rb

Merge pull request #8096 from cirosantilli/regex-to-string

2015-01-15 14:37:11 -08: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

teamcity_service.rb

Annotate models

2015-01-22 09:40:03 -08:00