diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 1882ddaf4..ea03d1a1c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -347,7 +347,7 @@ class ProjectsController < ApplicationController def project_params params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier, - :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :auto_init, + :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :blockchain, :blockchain_token_all, :blockchain_init_token, :pr_view_admin) end diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb index fd0128c3d..8ef7befac 100644 --- a/app/forms/projects/create_form.rb +++ b/app/forms/projects/create_form.rb @@ -1,6 +1,6 @@ class Projects::CreateForm < BaseForm attr_accessor :user_id, :name, :description, :repository_name, :project_category_id, - :project_language_id, :ignore_id, :license_id, :private, :owner, :auto_init, + :project_language_id, :ignore_id, :license_id, :private, :owner, :blockchain, :blockchain_token_all, :blockchain_init_token validates :user_id, :name, :repository_name, presence: true @@ -10,7 +10,7 @@ class Projects::CreateForm < BaseForm validates :repository_name, length: { maximum: 100 } validates :description, length: { maximum: 200 } - validate :check_ignore, :check_license, :check_auto_init, :check_owner, :check_max_repo_creation + validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation validate do check_project_category(project_category_id) check_project_language(project_language_id) diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index e91f01d7d..c4f892f7f 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -65,8 +65,7 @@ class Projects::CreateService < ApplicationService { hidden: !repo_is_public, user_id: params[:user_id], - identifier: params[:repository_name], - auto_init: params[:auto_init] + identifier: params[:repository_name] } end diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb index 9fba6122e..4583838f1 100644 --- a/app/services/repositories/create_service.rb +++ b/app/services/repositories/create_service.rb @@ -75,7 +75,7 @@ class Repositories::CreateService < ApplicationService name: params[:identifier], private: params[:hidden], # readme: "ReadMe", - auto_init: params[:auto_init], + "auto_init": true, # "description": "string", # "gitignores": "string", # "issue_labels": "string", @@ -89,7 +89,7 @@ class Repositories::CreateService < ApplicationService license = project.license hash = hash.merge(license: license.name) if license hash = hash.merge(gitignores: ignore.name) if ignore - hash = hash.merge(auto_init: true) if ignore && license + hash = hash.merge(auto_init: true) if ignore || license hash end end