Download as
Browse Code »

Commit 1e8b111be85df0db6c8000ef9a710bc0221eae83

Authored by Dmitriy Zaporozhets
2 parents f403da73 e6ea73c7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/issues/show.html.haml
  Diff comments   View file @1e8b111
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 - if @issue.closed 9 - if @issue.closed
10 = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn" 10 = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
11 - else 11 - else
12 - = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request" 12 + = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close Issue"
13 - if can?(current_user, :admin_project, @project) || @issue.author == current_user 13 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
14 = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do 14 = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
15 Edit 15 Edit
app/views/projects/team.html.haml
  Diff comments   View file @1e8b111
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 .alert-message.block-message 4 .alert-message.block-message
5 = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do 5 = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
6 New Team Member 6 New Team Member
7 - %p Ream more about project permissions #{link_to "here", help_permissions_path, :class => "vlink"} 7 + %p Read more about project permissions #{link_to "here", help_permissions_path, :class => "vlink"}
8 %p To open team member profile - click on avatar. 8 %p To open team member profile - click on avatar.
9 9
10 10