Commit 0aed79b5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Proper message for archived projects at MR#show page

Fixes #940
parents 12778fbe 5fbf15cb
- unless @allowed_to_merge
- if @project.archived?
.bs-callout.bs-callout-warning
%strong Archived projects cannot be committed to!
- else
.bs-callout
%strong You don't have permission to merge this MR
......
......@@ -9,8 +9,8 @@
.col-md-3.project-side.hidden-sm
.clearfix
- if @project.archived?
.alert
%h5
.alert.alert-warning
%h4
%i.icon-warning-sign
Archived project!
%p Repository is read-only
......
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