• Marin Jankovski's avatar
    Merge remote-tracking branch 'ce/master' into merge_ce · 3e875b05
    Marin Jankovski authored
    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
    3e875b05
project_team.rb 4.73 KB