From 0a7a834ebe765b6ce43410a301d487cd523a744a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 19 Jun 2015 13:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE--=E7=89=88=E6=9C=AC=E5=BA=93--=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20404=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb    |  2 +-
 .../settings/_new_repositories.html.erb       |  3 +--
 .../projects/settings/_repositories.html.erb  | 26 ++++++-------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index d0af82c8c..ffa3fb4aa 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -227,7 +227,7 @@ update
     elsif request.get?
     respond_to do |format|
       format.html{
-        render :layout => "project_base"
+        render :layout => "base_projects"
       }
     end
 
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 6e0d74849..ca771a487 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -33,8 +33,7 @@
     <td><a href="javascript:viod(0)" class="c_blue" >
       <% if repository.scm_name=="Git"%>
         <%if User.current.allowed_to?(:manage_repository, @project) %>
-          <%= link_to(l(:label_user_plural), committers_repository_path(repository)
-                      ) %>
+          <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
         <% end %>
   <% end %>
     </a></td>
diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb
index 3d9d71a56..6c340f47c 100644
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -27,25 +27,15 @@
       <% end %>
 
       <td class="buttons" style="text-align:left">
-      	<% if repository.scm_name=="Subversion"%>
-            <%if User.current.allowed_to?(:manage_repository, @project) %>
-            	<%= link_to(l(:label_user_plural), committers_repository_path(repository),
-             	:class => 'icon icon-user') %>
-            	<%= link_to(l(:button_edit), edit_repository_path(repository),
-             	:class => 'icon icon-edit') %>
-            	 <%= delete_link repository_path(repository) %>
-      		<% end %>
-      	<% elsif repository.scm_name=="Git"%>
-            <%if User.current.allowed_to?(:manage_repository, @project) %>
-            <!-- <%#= link_to(l(:button_edit), edit_repository_path(repository),
+
+      <%if User.current.allowed_to?(:manage_repository, @project) %>
+         <!-- <%#= link_to(l(:button_edit), edit_repository_path(repository),
              :class => 'icon icon-edit') %> -->
-            <%= link_to(l(:label_user_plural), committers_repository_path(repository),
-             :class => 'icon icon-user') %>
-            <% if repository.login.to_s==User.current.login.to_s %>
-        		<%= delete_link repository_path(repository) %>
-            <% end %>
-      		<% end %>
-      	<% end %>
+         <%= link_to(l(:label_user_plural), committers_repository_path(repository), :class => 'icon icon-user') %>
+         <% if repository.login.to_s==User.current.login.to_s %>
+            <%= delete_link repository_path(repository) %>
+         <% end %>
+      <% end %>
       </td>
     </tr>
   <% end %>