Merge branch 'develop' into standalone_develop
This commit is contained in:
		
						commit
						d78bd895d1
					
				| 
						 | 
				
			
			@ -204,7 +204,7 @@ class ProjectsController < ApplicationController
 | 
			
		|||
 | 
			
		||||
        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier, project_name: @project.name)).validate!
 | 
			
		||||
  
 | 
			
		||||
        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
 | 
			
		||||
        private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || !@project.is_public
 | 
			
		||||
 | 
			
		||||
        new_project_params = project_params.except(:private).merge(is_public: !private)
 | 
			
		||||
        @project.update_attributes!(new_project_params)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue