Download as
Browse Code »

Commit 99490159e5f9d6ff4b45f78b977d01caa1e3c4fc

Authored by Dmitriy Zaporozhets
2 parents 7060668e 911bf5f0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 12 additions and 10 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @9949015
@@ -303,15 +303,6 @@ Check if GitLab and its environment are configured correctly: @@ -303,15 +303,6 @@ Check if GitLab and its environment are configured correctly:
303 # or 303 # or
304 sudo /etc/init.d/gitlab restart 304 sudo /etc/init.d/gitlab restart
305 305
306 -## Double-check Application Status  
307 -  
308 -To make sure you didn't miss anything run a more thorough check with:  
309 -  
310 - sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production  
311 -  
312 -If all items are green, then congratulations on successfully installing GitLab!  
313 -However there are still a few steps left.  
314 -  
315 306
316 ## Compile assets 307 ## Compile assets
317 308
@@ -347,7 +338,17 @@ Make sure to edit the config file to match your setup: @@ -347,7 +338,17 @@ Make sure to edit the config file to match your setup:
347 338
348 # Done! 339 # Done!
349 340
350 -Visit YOUR_SERVER for your first GitLab login. 341 +## Double-check Application Status
  342 +
  343 +To make sure you didn't miss anything run a more thorough check with:
  344 +
  345 + sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
  346 +
  347 +If all items are green, then congratulations on successfully installing GitLab!
  348 +
  349 +## Initial Login
  350 +
  351 +Visit YOUR_SERVER in your web browser for your first GitLab login.
351 The setup has created an admin account for you. You can use it to log in: 352 The setup has created an admin account for you. You can use it to log in:
352 353
353 admin@local.host 354 admin@local.host
lib/support/nginx/gitlab
  Diff comments   View file @9949015
@@ -35,6 +35,7 @@ server { @@ -35,6 +35,7 @@ server {
35 proxy_set_header X-Forwarded-Proto $scheme; 35 proxy_set_header X-Forwarded-Proto $scheme;
36 proxy_set_header Host $http_host; 36 proxy_set_header Host $http_host;
37 proxy_set_header X-Real-IP $remote_addr; 37 proxy_set_header X-Real-IP $remote_addr;
  38 + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
38 39
39 proxy_pass http://gitlab; 40 proxy_pass http://gitlab;
40 } 41 }