diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-26 10:52:50 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-26 10:52:50 +0200 |
| commit | 8310b4589d0216cf7bb12eeee97785c3372690d9 (patch) | |
| tree | 460d415b2fd4d2f3ed5a5cdfc5c25a4783adf833 | |
| parent | 3df417b857c3bcf6257b5d9d42bb816f63fa9a28 (diff) | |
| parent | 19c2c90ccac86a21eb4266b9a5972162f917f692 (diff) | |
| download | gitlab-ce-8310b4589d0216cf7bb12eeee97785c3372690d9.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index 81531bb0ac0..cfc1bd99a20 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -6,7 +6,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController before_filter :authorize_admin_project!, only: [:destroy, :create] def index - @branches = @project.protected_branches.all + @branches = @project.protected_branches.to_a @protected_branch = @project.protected_branches.new end diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 1d3a3ca1333..20656d297e5 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -113,7 +113,9 @@ The project can be committed to. %br %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 %p Archiving the project will mark its repository as read-only. @@ -121,7 +123,9 @@ It is hidden from the dashboard and doesn't show up in searches. %br %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 %p.nothing_here_message Only the project owner can archive a project |