Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-03 23:00:51 +0300
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-03 23:14:33 +0300
commit3c91841d032f02b0b0d4c532998bbc923247e804 (patch)
tree874423ab53847ef1bcd290284bbfe179e8493a43 /app/controllers/projects/protected_refs_controller.rb
parent9f4b8dba805915bd21d315f159035449f9f4bef0 (diff)
Created ProtectedRefsController to reduce Tags/Branches duplication
Fixes ProtectedBranches#create flash errors bug due to typo in 'flash[:alert] = @protected_branches.errors'
Diffstat (limited to 'app/controllers/projects/protected_refs_controller.rb')
-rw-r--r--app/controllers/projects/protected_refs_controller.rb48
1 files changed, 48 insertions, 0 deletions
diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb
new file mode 100644
index 00000000000..63f005124a9
--- /dev/null
+++ b/app/controllers/projects/protected_refs_controller.rb
@@ -0,0 +1,48 @@
+class Projects::ProtectedRefsController < Projects::ApplicationController
+ include RepositorySettingsRedirect
+ # Authorize
+ before_action :require_non_empty_project
+ before_action :authorize_admin_project!
+ before_action :load_protected_ref, only: [:show, :update, :destroy]
+
+ layout "project_settings"
+
+ def index
+ redirect_to_repository_settings(@project)
+ end
+
+ def create
+ self.protected_ref = create_service.new(@project, current_user, protected_ref_params).execute
+ unless protected_ref.persisted?
+ flash[:alert] = protected_ref.errors.full_messages.join(', ').html_safe
+ end
+ redirect_to_repository_settings(@project)
+ end
+
+ def show
+ self.matching_refs = protected_ref.matching(project_refs)
+ end
+
+ def update
+ self.protected_ref = update_service.new(@project, current_user, protected_ref_params).execute(protected_ref)
+
+ if protected_ref.valid?
+ respond_to do |format|
+ format.json { render json: protected_ref, status: :ok }
+ end
+ else
+ respond_to do |format|
+ format.json { render json: protected_ref.errors, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ def destroy
+ protected_ref.destroy
+
+ respond_to do |format|
+ format.html { redirect_to_repository_settings(@project) }
+ format.js { head :ok }
+ end
+ end
+end