diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index cba08650..13292d4e 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -9,7 +9,7 @@ - if @issue.closed = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn" - 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 = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do Edit diff --git a/app/views/projects/team.html.haml b/app/views/projects/team.html.haml index a19f5702..7f2d6dcc 100644 --- a/app/views/projects/team.html.haml +++ b/app/views/projects/team.html.haml @@ -4,7 +4,7 @@ .alert-message.block-message = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do 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.