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/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) %> <% else %> - <%= join_in_course_for_list(@course, User.current,['regular'])%> + <%#= join_in_course_for_list(@course, User.current,['regular'])%> <% end -%> 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 @@
<% 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") %> -
<%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(@changesets_latest_coimmit.author_name) %>
+
<%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>:
<%= @changesets_latest_coimmit.message %>