Commit 0aed79b5b5e406b3a2336e5c1173ad4fa6f8f862
Exists in
spb-stable
and in
3 other branches
Merge branch 'improve-archived-projects' into 'master'
Proper message for archived projects at MR#show page Fixes #940
Showing
2 changed files
with
8 additions
and
4 deletions
Show diff stats
app/views/projects/merge_requests/show/_mr_accept.html.haml
| 1 | 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 | 10 | - if @show_merge_controls | ... | ... |
app/views/projects/show.html.haml