Download as
Browse Code »

Commit a443a1986250f21c69f368f914ee0d119371f2de

Authored by skv
1 parent c797493e
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

fix warnings

Showing 2 changed files with 7 additions and 3 deletions   Show diff stats
app/controllers/projects/protected_branches_controller.rb
  Diff comments   View file @a443a19
... ... @@ -6,7 +6,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
6 6 before_filter :authorize_admin_project!, only: [:destroy, :create]
7 7  
8 8 def index
9   - @branches = @project.protected_branches.all
  9 + @branches = @project.protected_branches.to_a
10 10 @protected_branch = @project.protected_branches.new
11 11 end
12 12  
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @a443a19
... ... @@ -113,7 +113,9 @@
113 113 The project can be committed to.
114 114 %br
115 115 %strong Once active this project shows up in the search and on the dashboard.
116   - = 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"
  116 + = link_to 'Unarchive', unarchive_project_path(@project),
  117 + 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." },
  118 + method: :post, class: "btn btn-remove"
117 119 - else
118 120 %p
119 121 Archiving the project will mark its repository as read-only.
... ... @@ -121,7 +123,9 @@
121 123 It is hidden from the dashboard and doesn't show up in searches.
122 124 %br
123 125 %strong Archived projects cannot be committed to!
124   - = 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"
  126 + = link_to 'Archive', archive_project_path(@project),
  127 + data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
  128 + method: :post, class: "btn btn-remove"
125 129 - else
126 130 %p.nothing_here_message Only the project owner can archive a project
127 131  
... ...