From f30d56494e45d44e44ee96407f86bac04510424e Mon Sep 17 00:00:00 2001 From: Andrea Dal Ponte Date: Fri, 6 Apr 2012 12:00:13 +0200 Subject: [PATCH 1/2] admin_user_path correction --- app/views/admin/projects/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 6685738b..e3f5c3b5 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -51,7 +51,7 @@ - @admin_project.users_projects.each do |tm| %tr %td - = link_to tm.user_name, admin_users_path(tm.user) + = link_to tm.user_name, admin_user_path(tm.user) %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), :class => "medium project-access-select", :disabled => :disabled %td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small" %td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn danger small" From a6c1201c906bc3b0bfd4151bbc1d738bd46a1c24 Mon Sep 17 00:00:00 2001 From: Abe Voelker Date: Fri, 6 Apr 2012 11:35:48 -0500 Subject: [PATCH 2/2] Fix install instructions' echo missing -e flag Needed to expand the \n into a newline. My bad. --- doc/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.md b/doc/installation.md index c5f2057f..05f29d83 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -107,7 +107,7 @@ Get gitolite source code: Setup: - sudo -u git sh -c 'echo "PATH=\$PATH:/home/git/bin\nexport PATH" > /home/git/.profile' + sudo -u git sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" > /home/git/.profile' sudo -u git -i -H /home/git/gitolite/src/gl-system-install sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub sudo chmod 777 /home/git/gitlab.pub