Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/repositories_controller.rb

@@ -263,7 +263,7 @@ update
       @course_tag = params[:course]
       project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       ip = RepositoriesHelper::REPO_IP_ADDRESS
-      gitlab_address = RepositoriesHelper::REPO_GITLAB_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"
       else

app/helpers/repositories_helper.rb

@@ -47,6 +47,7 @@ module RepositoriesHelper
 
   def user_commit_rep(mail)
     user = User.find_by_mail(mail)
+    user.nil? ? User.find(2) :  User.find_by_mail(mail)
   end
 
   def render_properties(properties)

config/configuration.yml

@@ -200,6 +200,9 @@ default:
   repository_root_path: '/tmp/htdocs'
   judge_server: 'http://judge.trustie.net/'
 
+  # Git's url
+  gitlab_address: 'http://gitfast.trustie.net'
+
 # specific configuration options for production environment
 # that overrides the default ones
 production: