Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang

app/helpers/application_helper.rb

@@ -2943,23 +2943,11 @@ int main(int argc, char** argv){
 end
 
 def user_url_in_org(user_id)
-  if Rails.env.development?
-    return "http://localhost:3000/users/" + user_id.to_s
-  elsif Rails.env.test?
-    return "https://www.test.forge.trustie.net/users/" + user_id.to_s
-  else
-    return "https://www.trustie.net/users/" + user_id.to_s
-  end
+    return Setting.host_name + "/users/" + user_id.to_s
 end
 
 def logout_url_without_domain
-  if Rails.env.development?
-    return "http://localhost:3000/logout"
-  elsif Rails.env.test?
-    return "https://test.forge.trustie.net/logout"
-  else
-    return "https://www.trustie.net/logout"
-  end
+  return Setting.host_name + "/logout"
 end
 
 def signin_url_without_domain