Merge branch 'hjq_beidou' into gitlab_guange

config/configuration.yml.template

@@ -201,7 +201,7 @@ default:
   judge_server: 'http://judge.trustie.net/'
 
   # Git's url
-  gitlab_address: 'http://gitfast.trustie.net'
+  gitlab_address: 'http://git8.trustie.net'
 
 # specific configuration options for production environment
 # that overrides the default ones

config/initializers/gitlab_config.rb.template

@@ -1,8 +1,8 @@
 Gitlab.configure do |config|
   # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
   # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
-  config.endpoint       = 'http://gitfast.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
-  config.private_token  = 'fPc_gBmEiSANve8TCfxW'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  config.endpoint       = 'http://git8.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.private_token  = 'bshrhYzhDzrMLQysmasx'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
   # Optional
   # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
   # config.sudo         = 'user'                       # username for sudo mode, default: nil