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

..

admin_routing_spec.rb

Display list of recipientgroups properly

2014-08-08 20:47:08 +02:00

notifications_routing_spec.rb

Move Profile related controllers under Profiles:: module

2013-06-24 18:24:14 +03:00

project_routing_spec.rb

Fix tests for blobs refactoring

2015-01-26 16:08:59 -08:00

routing_spec.rb

Fix for the broken routing specs

2014-06-08 23:42:09 +02:00