Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0aed79b5
Commit
0aed79b5
authored
Mar 25, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-archived-projects' into 'master'
Proper message for archived projects at MR#show page Fixes #940
parents
12778fbe
5fbf15cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+6
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
0aed79b5
-
unless
@allowed_to_merge
-
unless
@allowed_to_merge
.bs-callout
-
if
@project
.
archived?
%strong
You don't have permission to merge this MR
.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
-
if
@show_merge_controls
-
if
@show_merge_controls
...
...
app/views/projects/show.html.haml
View file @
0aed79b5
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
.col-md-3.project-side.hidden-sm
.col-md-3.project-side.hidden-sm
.clearfix
.clearfix
-
if
@project
.
archived?
-
if
@project
.
archived?
.alert
.alert
.alert-warning
%h
5
%h
4
%i
.icon-warning-sign
%i
.icon-warning-sign
Archived project!
Archived project!
%p
Repository is read-only
%p
Repository is read-only
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment