• Valery Sizov's avatar
    Merge CE master into EE master · 3fcd75a9
    Valery Sizov authored
    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
    3fcd75a9
mentionable_spec.rb 650 Bytes