Commit 8310b458 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 3df417b8 19c2c90c
...@@ -6,7 +6,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController ...@@ -6,7 +6,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
before_filter :authorize_admin_project!, only: [:destroy, :create] before_filter :authorize_admin_project!, only: [:destroy, :create]
def index def index
@branches = @project.protected_branches.all @branches = @project.protected_branches.to_a
@protected_branch = @project.protected_branches.new @protected_branch = @project.protected_branches.new
end end
......
...@@ -113,7 +113,9 @@ ...@@ -113,7 +113,9 @@
The project can be committed to. The project can be committed to.
%br %br
%strong Once active this project shows up in the search and on the dashboard. %strong Once active this project shows up in the search and on the dashboard.
= link_to 'Unarchive', unarchive_project_path(@project), confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again.", method: :post, class: "btn btn-remove" = link_to 'Unarchive', unarchive_project_path(@project),
data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again." },
method: :post, class: "btn btn-remove"
- else - else
%p %p
Archiving the project will mark its repository as read-only. Archiving the project will mark its repository as read-only.
...@@ -121,7 +123,9 @@ ...@@ -121,7 +123,9 @@
It is hidden from the dashboard and doesn't show up in searches. It is hidden from the dashboard and doesn't show up in searches.
%br %br
%strong Archived projects cannot be committed to! %strong Archived projects cannot be committed to!
= link_to 'Archive', archive_project_path(@project), confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to.", method: :post, class: "btn btn-remove" = link_to 'Archive', archive_project_path(@project),
data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
method: :post, class: "btn btn-remove"
- else - else
%p.nothing_here_message Only the project owner can archive a project %p.nothing_here_message Only the project owner can archive a project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment