diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index 10dca47fdede1c49b774663d3a28c6f35899c48e..fdbe0044d3cd5dfdba81f4ee4901a8d52887ee7c 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -3,19 +3,23 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
before_action :require_non_empty_project
before_action :authorize_admin_project!
before_action :load_protected_branch, only: [:show, :update, :destroy]
+ before_action :load_protected_branches, only: [:index, :create]
layout "project_settings"
def index
- @protected_branches = @project.protected_branches.order(:name).page(params[:page])
@protected_branch = @project.protected_branches.new
gon.push({ open_branches: @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } } })
end
def create
- @project.protected_branches.create(protected_branch_params)
- redirect_to namespace_project_protected_branches_path(@project.namespace,
- @project)
+ service = ProtectedBranches::CreateService.new(@project, current_user, protected_branch_params)
+ if service.execute
+ redirect_to namespace_project_protected_branches_path(@project.namespace, @project)
+ else
+ @protected_branch = service.protected_branch
+ render :index
+ end
end
def show
@@ -23,13 +27,15 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
end
def update
- if @protected_branch && @protected_branch.update_attributes(protected_branch_params)
+ service = ProtectedBranches::UpdateService.new(@project, current_user, params[:id], protected_branch_params)
+
+ if service.execute
respond_to do |format|
- format.json { render json: @protected_branch, status: :ok }
+ format.json { render json: service.protected_branch, status: :ok }
end
else
respond_to do |format|
- format.json { render json: @protected_branch.errors, status: :unprocessable_entity }
+ format.json { render json: service.protected_branch.errors, status: :unprocessable_entity }
end
end
end
@@ -52,4 +58,8 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
def protected_branch_params
params.require(:protected_branch).permit(:name, :developers_can_push, :developers_can_merge)
end
+
+ def load_protected_branches
+ @protected_branches = @project.protected_branches.order(:name).page(params[:page])
+ end
end
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index a411cb417e29d6c222179bc9e05c978e56f72d64..b0fde6c6c1b29f5f1e2c0dc12110ee16c106f3c2 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -5,13 +5,21 @@ class ProtectedBranch < ActiveRecord::Base
validates :name, presence: true
validates :project, presence: true
- has_one :merge_access_level
- has_one :push_access_level
+ has_one :merge_access_level, dependent: :destroy
+ has_one :push_access_level, dependent: :destroy
def commit
project.commit(self.name)
end
+ def developers_can_push
+ self.push_access_level && self.push_access_level.developers?
+ end
+
+ def developers_can_merge
+ self.merge_access_level && self.merge_access_level.developers?
+ end
+
# Returns all protected branches that match the given branch name.
# This realizes all records from the scope built up so far, and does
# _not_ return a relation.
diff --git a/app/models/protected_branch/merge_access_level.rb b/app/models/protected_branch/merge_access_level.rb
index 78cec5bf566691b6bdf6e93aa3a1c57aa688fc6f..cfaa9c166fe149514ee35584d25416a7e20b7864 100644
--- a/app/models/protected_branch/merge_access_level.rb
+++ b/app/models/protected_branch/merge_access_level.rb
@@ -1,3 +1,5 @@
class ProtectedBranch::MergeAccessLevel < ActiveRecord::Base
belongs_to :protected_branch
+
+ enum access_level: [:masters, :developers]
end
diff --git a/app/models/protected_branch/push_access_level.rb b/app/models/protected_branch/push_access_level.rb
index d53c4c391e34d8101ebbe4c410efaa88b1bff6ad..4345dc4ede4a91afd6277cd82684b8abbde69e2f 100644
--- a/app/models/protected_branch/push_access_level.rb
+++ b/app/models/protected_branch/push_access_level.rb
@@ -1,3 +1,5 @@
class ProtectedBranch::PushAccessLevel < ActiveRecord::Base
belongs_to :protected_branch
+
+ enum access_level: [:masters, :developers]
end
diff --git a/app/services/protected_branches/base_service.rb b/app/services/protected_branches/base_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d4be8698a5fc5984132b93f85f517b1f93850668
--- /dev/null
+++ b/app/services/protected_branches/base_service.rb
@@ -0,0 +1,17 @@
+module ProtectedBranches
+ class BaseService < ::BaseService
+ def set_access_levels!
+ if params[:developers_can_push] == '0'
+ @protected_branch.push_access_level.masters!
+ elsif params[:developers_can_push] == '1'
+ @protected_branch.push_access_level.developers!
+ end
+
+ if params[:developers_can_merge] == '0'
+ @protected_branch.merge_access_level.masters!
+ elsif params[:developers_can_merge] == '1'
+ @protected_branch.merge_access_level.developers!
+ end
+ end
+ end
+end
diff --git a/app/services/protected_branches/create_service.rb b/app/services/protected_branches/create_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..743f7bd2ce1abd129d86dbd707c06043444ae80e
--- /dev/null
+++ b/app/services/protected_branches/create_service.rb
@@ -0,0 +1,19 @@
+class ProtectedBranches::CreateService < BaseService
+ attr_reader :protected_branch
+
+ def execute
+ ProtectedBranch.transaction do
+ @protected_branch = project.protected_branches.new(name: params[:name])
+ @protected_branch.save!
+
+ @protected_branch.create_push_access_level!
+ @protected_branch.create_merge_access_level!
+
+ set_access_levels!
+ end
+
+ true
+ rescue ActiveRecord::RecordInvalid
+ false
+ end
+end
diff --git a/app/services/protected_branches/update_service.rb b/app/services/protected_branches/update_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ed59b06b79a1ab241b47b636f72e2146e9546fe5
--- /dev/null
+++ b/app/services/protected_branches/update_service.rb
@@ -0,0 +1,21 @@
+module ProtectedBranches
+ class UpdateService < BaseService
+ attr_reader :protected_branch
+
+ def initialize(project, current_user, id, params = {})
+ super(project, current_user, params)
+ @id = id
+ end
+
+ def execute
+ ProtectedBranch.transaction do
+ @protected_branch = ProtectedBranch.find(@id)
+ set_access_levels!
+ end
+
+ true
+ rescue ActiveRecord::RecordInvalid
+ false
+ end
+ end
+end