Download as
Browse Code »

Commit 8fa22de9acc51af878009c774fb49759e34427df

Authored by Dmitriy Zaporozhets
2 parents 1a3ce182 83d573f5
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/admin/projects/show.html.haml
  Diff comments   View file @8fa22de
... ... @@ -51,7 +51,7 @@
51 51 - @admin_project.users_projects.each do |tm|
52 52 %tr
53 53 %td
54   - = link_to tm.user_name, admin_users_path(tm.user)
  54 + = link_to tm.user_name, admin_user_path(tm.user)
55 55 %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), :class => "medium project-access-select", :disabled => :disabled
56 56 %td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small"
57 57 %td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn danger small"
... ...
doc/installation.md
  Diff comments   View file @8fa22de
... ... @@ -107,7 +107,7 @@ Get gitolite source code:
107 107  
108 108 Setup:
109 109  
110   - sudo -u git sh -c 'echo "PATH=\$PATH:/home/git/bin\nexport PATH" > /home/git/.profile'
  110 + sudo -u git sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" > /home/git/.profile'
111 111 sudo -u git -i -H /home/git/gitolite/src/gl-system-install
112 112 sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub
113 113 sudo chmod 777 /home/git/gitlab.pub
... ...