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

Dmitriy Zaporozhets
2 parents 25924a90 9ed5a1af
Showing 2 changed files with 30 additions and 2 deletions Show diff stats
app/views/keys/new.html.haml
doc/installation.md
 %h3 New key
 %hr
 = render 'form'
+
+:javascript
+  $('#key_key').on('keyup', function(){
+    var title = $('#key_title'),
+        val      = $('#key_key').val(),
+        key_mail = val.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+|\.[a-zA-Z0-9._-]+)/gi);
+
+    if( key_mail && key_mail.length > 0 && title.val() == '' ){
+      $('#key_title').val( key_mail );
+    }
+  });
 \ No newline at end of file
@@ -223,12 +223,29 @@ Edit /etc/nginx/nginx.conf. Add next code to **http** section:
     }
     server {
-        listen 80;
-        server_name mygitlab.com;
+        listen YOUR_SERVER_IP:80;
+        server_name gitlab.YOUR_SUBDOMAIN.com;
         root /home/gitlab/gitlab/public;
+        
+        # individual nginx logs for this gitlab vhost
+        access_log  /var/log/nginx/gitlab_access.log;
+        error_log   /var/log/nginx/gitlab_error.log;
+        
+        location / {
+        # serve static files from defined root folder;.
+        # @gitlab is a named location for the upstream fallback, see below
         try_files $uri $uri/index.html $uri.html @gitlab;
+        }
+        # if a file, which is not found in the root folder is requested, 
+        # then the proxy pass the request to the upsteam (gitlab unicorn)
         location @gitlab {
+          proxy_redirect     off;
+          # you need to change this to "https", if you set "ssl" directive to "on"
+          proxy_set_header   X-FORWARDED_PROTO http;
+          proxy_set_header   Host              gitlab.YOUR_SUBDOMAIN.com:80;
+          proxy_set_header   X-Real-IP         $remote_addr;
+        
           proxy_pass http://gitlab;
         }
1	%h3 New key	1	%h3 New key
2	%hr	2	%hr
3	= render 'form'	3	= render 'form'
		4	+
		5	+:javascript
		6	+ $('#key_key').on('keyup', function(){
		7	+ var title = $('#key_title'),
		8	+ val = $('#key_key').val(),
		9	+ key_mail = val.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\|\.[a-zA-Z0-9._-]+)/gi);
		10	+
		11	+ if( key_mail && key_mail.length > 0 && title.val() == '' ){
		12	+ $('#key_title').val( key_mail );
		13	+ }
		14	+ });
4	\ No newline at end of file	15	\ No newline at end of file
	@@ -223,12 +223,29 @@ Edit /etc/nginx/nginx.conf. Add next code to http section:		@@ -223,12 +223,29 @@ Edit /etc/nginx/nginx.conf. Add next code to http section:
223	}	223	}
224		224
225	server {	225	server {
226	- listen 80;
227	- server_name mygitlab.com;	226	+ listen YOUR_SERVER_IP:80;
		227	+ server_name gitlab.YOUR_SUBDOMAIN.com;
228	root /home/gitlab/gitlab/public;	228	root /home/gitlab/gitlab/public;
		229	+
		230	+ # individual nginx logs for this gitlab vhost
		231	+ access_log /var/log/nginx/gitlab_access.log;
		232	+ error_log /var/log/nginx/gitlab_error.log;
		233	+
		234	+ location / {
		235	+ # serve static files from defined root folder;.
		236	+ # @gitlab is a named location for the upstream fallback, see below
229	try_files $uri $uri/index.html $uri.html @gitlab;	237	try_files $uri $uri/index.html $uri.html @gitlab;
		238	+ }
230		239
		240	+ # if a file, which is not found in the root folder is requested,
		241	+ # then the proxy pass the request to the upsteam (gitlab unicorn)
231	location @gitlab {	242	location @gitlab {
		243	+ proxy_redirect off;
		244	+ # you need to change this to "https", if you set "ssl" directive to "on"
		245	+ proxy_set_header X-FORWARDED_PROTO http;
		246	+ proxy_set_header Host gitlab.YOUR_SUBDOMAIN.com:80;
		247	+ proxy_set_header X-Real-IP $remote_addr;
		248	+
232	proxy_pass http://gitlab;	249	proxy_pass http://gitlab;
233	}	250	}
234		251