From 1dd86b9116222e07aedf2050b4d9f52310ec7acf Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Tue, 13 Aug 2013 15:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86UTF-8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B=E4=BF=AE=E6=AD=A3=E4=BA=86=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb            | 2 +-
 app/views/projects/_edit.html.erb            | 1 -
 app/views/repositories/_form_create.html.erb | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0abe614d0..0731445b4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1006,7 +1006,7 @@ module ApplicationHelper
       html << "<div id='errorExplanation'><ul>\n"
       errors.each do |error|
         ###by xianbo
-        if(error!="#{l(:abel_repository_path_not_null)}")
+        if(error!=l(:label_repository_path_not_null))
           html << "<li>#{h error}</li>\n"
         end
         ###xianbo
diff --git a/app/views/projects/_edit.html.erb b/app/views/projects/_edit.html.erb
index 07042f509..8661b6874 100644
--- a/app/views/projects/_edit.html.erb
+++ b/app/views/projects/_edit.html.erb
@@ -1,5 +1,4 @@
 <div class="box tabular" style="margin-right:10px;" >
-	<div style="padding-left: 100px"><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></div>
 <%= labelled_form_for @project do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
diff --git a/app/views/repositories/_form_create.html.erb b/app/views/repositories/_form_create.html.erb
index 5135cb6d2..de6d15438 100644
--- a/app/views/repositories/_form_create.html.erb
+++ b/app/views/repositories/_form_create.html.erb
@@ -29,8 +29,6 @@ border:none
 <% end %></p>
 <!-- <p><%= f.text_field :url, :size => 60, :required => true,:readonly=>true, :class=>'textbg'%></p> -->
 <p><%= f.password_field :upassword, :required =>true, :label=> :field_password %></p>
-<p><%= f.select(:path_encoding, [nil] + Setting::ENCODINGS, :label => l(:field_scm_path_encoding))%>
-   <%= l(:text_scm_path_encoding_note)%></p>
 </div>
 <p>
   <%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>