mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-20 10:06:04 +10:00
Timothy Andrew
2a5cb7ec52
1. Allow entering any branch name for a protected branch.
- Either pick from a list of options, or enter it manually
- You can enter wildcards.
2. Display branches matching a protected branch.
- Add a `ProtectedBranches#show` page that displays the branches
matching the given protected branch, or a message if there are no
matches.
- On the `index` page, display the last commit for an exact match,
or the number of matching branches for a wildcard match.
- Add an `iid` column to `protected_branches` - this is what we use for
the `show` page URL.
- On the off chance that this feature is unnecessary, this commit
encapsulates it neatly, so it can be removed without affecting
anything else.
3. Remove the "Last Commit" column from the list of protected branches.
- There's no way to pull these for wildcard protected branches, so it's
best left for the `show` page.
- Rename the `@branches` instance variable to `@protected_branches`
- Minor styling changes with the "Unprotect" button - floated right
like the "Revoke" button for personal access tokens
4. Paginate the list of protected branches.
5. Move the instructions to the left side of the page.
56 lines
1.6 KiB
Ruby
56 lines
1.6 KiB
Ruby
class Projects::ProtectedBranchesController < Projects::ApplicationController
|
|
# Authorize
|
|
before_action :require_non_empty_project
|
|
before_action :authorize_admin_project!
|
|
before_action :load_protected_branch, only: [:show, :update, :destroy]
|
|
|
|
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 } } })
|
|
end
|
|
|
|
def create
|
|
@project.protected_branches.create(protected_branch_params)
|
|
redirect_to namespace_project_protected_branches_path(@project.namespace,
|
|
@project)
|
|
end
|
|
|
|
def show
|
|
@matching_branches = @protected_branch.matching(@project.repository.branches)
|
|
end
|
|
|
|
def update
|
|
if @protected_branch && @protected_branch.update_attributes(protected_branch_params)
|
|
respond_to do |format|
|
|
format.json { render json: @protected_branch, status: :ok }
|
|
end
|
|
else
|
|
respond_to do |format|
|
|
format.json { render json: @protected_branch.errors, status: :unprocessable_entity }
|
|
end
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@protected_branch.destroy
|
|
|
|
respond_to do |format|
|
|
format.html { redirect_to namespace_project_protected_branches_path }
|
|
format.js { head :ok }
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def load_protected_branch
|
|
@protected_branch = @project.protected_branches.find(params[:id])
|
|
end
|
|
|
|
def protected_branch_params
|
|
params.require(:protected_branch).permit(:name, :developers_can_push)
|
|
end
|
|
end
|