diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-26 21:39:13 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-26 21:39:13 +0200 |
| commit | 1e8b111be85df0db6c8000ef9a710bc0221eae83 (patch) | |
| tree | 33ef7b037cbd7847aef1552cb0b739852e998172 | |
| parent | f403da73f5e62794a0447aca879360494b08f678 (diff) | |
| parent | e6ea73c77600d413d370249b8e392734f7d1dbee (diff) | |
| download | gitlab-ce-1e8b111be85df0db6c8000ef9a710bc0221eae83.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/views/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/team.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index cba08650b02..13292d4e096 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 a19f57026f4..7f2d6dccfe4 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. |