Commit 0aed79b5b5e406b3a2336e5c1173ad4fa6f8f862

Authored by Dmitriy Zaporozhets
2 parents 12778fbe 5fbf15cb

Merge branch 'improve-archived-projects' into 'master'

Proper message for archived projects at MR#show page

Fixes #940
app/views/projects/merge_requests/show/_mr_accept.html.haml
1 - unless @allowed_to_merge 1 - unless @allowed_to_merge
2 - .bs-callout  
3 - %strong You don't have permission to merge this MR 2 + - if @project.archived?
  3 + .bs-callout.bs-callout-warning
  4 + %strong Archived projects cannot be committed to!
  5 + - else
  6 + .bs-callout
  7 + %strong You don't have permission to merge this MR
4 8
5 9
6 - if @show_merge_controls 10 - if @show_merge_controls
app/views/projects/show.html.haml
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
9 .col-md-3.project-side.hidden-sm 9 .col-md-3.project-side.hidden-sm
10 .clearfix 10 .clearfix
11 - if @project.archived? 11 - if @project.archived?
12 - .alert  
13 - %h5 12 + .alert.alert-warning
  13 + %h4
14 %i.icon-warning-sign 14 %i.icon-warning-sign
15 Archived project! 15 Archived project!
16 %p Repository is read-only 16 %p Repository is read-only