From 33501f0f69eaad87e1e8e902a725a008c0c8c7dc Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 28 Oct 2015 16:11:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=E7=9A=84=E2=80=9C=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E2=80=9D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb
index 889319d5e..366eb6886 100644
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@@ -73,7 +73,7 @@
 			<%= l(:lable_course_end)  %>
 		</span>
       <% else %>
-          <%= join_in_course_for_list(@course, User.current,['regular'])%>
+          <%#= join_in_course_for_list(@course, User.current,['regular'])%>
       <% end -%>
 	</div>
 </div>

From 2b89244f5285f77f8433a93ea34a0dbb9de43bbf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 30 Oct 2015 17:45:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7url?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E8=A7=A3=E5=86=B3urlhttp=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=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 +-
 app/views/repositories/show.html.erb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 06c1a67e4..4cec85833 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -265,7 +265,7 @@ update
       ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
       if @repository.type.to_s=="Repository::Gitlab"
-        @repos_url = "http://"+gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
+        @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else
         @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
             @repository.url.slice(project_path_cut, @repository.url.length).to_s
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 81c42c0ea..abddfc30c 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -31,7 +31,7 @@
       <div class="recordBanner mt10">
         <% if @changesets && !@changesets.empty? %>
             <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(@changesets_latest_coimmit.author_name) %></div>
+            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
                 <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                 <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
             </span>