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

..

gitlab

Merge CE master into EE master

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

disable_email_interceptor_spec.rb

Add a comment in interceptor spec.

2014-10-27 15:11:03 +01:00

extracts_path_spec.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

git_ref_validator_spec.rb

Validate branch-names and references in WebUI, API

2014-09-03 13:08:35 +02:00

votes_spec.rb

Specs refactoring to reduce test time. Disabled observers by default for specs

2013-04-10 23:28:42 +03:00