deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-26 21:39:13 +02:00
parent f403da73f5 e6ea73c776
commit 1e8b111be8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/issues/show.html.haml
View file

@ -9,7 +9,7 @@
- if @issue.closed - if @issue.closed
= link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn" = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
- else - else
= link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request" = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close Issue"
- if can?(current_user, :admin_project, @project) || @issue.author == current_user - if can?(current_user, :admin_project, @project) || @issue.author == current_user
= link_to edit_project_issue_path(@project, @issue), :class => "btn small" do = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
Edit Edit

2
app/views/projects/team.html.haml
View file

@ -4,7 +4,7 @@
.alert-message.block-message .alert-message.block-message
= link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
New Team Member New Team Member
%p Ream more about project permissions #{link_to "here", help_permissions_path, :class => "vlink"} %p Read more about project permissions #{link_to "here", help_permissions_path, :class => "vlink"}
%p To open team member profile - click on avatar. %p To open team member profile - click on avatar.