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

Dmitriy Zaporozhets
2 parents 12782adf 3467a3f8
Showing 2 changed files with 6 additions and 2 deletions Show diff stats
README.rdoc
app/views/projects/_form.html.haml
@@ -94,6 +94,10 @@ Install gitosis, edit conf/gitosis.yml &amp; start server
  
   echo "gem: --no-rdoc --no-ri" > ~/.gemrc
  
+== Community
+
+gitlabhq[https://groups.google.com/forum/?hl=en#!forum/gitlabhq] Google Group
+
 == Contribute
  
 We develop project on our private server.
@@ -19,13 +19,13 @@
       %tr
         %td
           .left= f.label :path
-          %cite.right git@yourserver:
+          %cite.right= "git@#{GITOSIS["host"]}:"
         %td
           = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
       %tr
         %td
           .left= f.label :code
-          %cite.right http://yourserver/
+          %cite.right= "http://#{GITOSIS["host"]}/"
         %td= f.text_field :code, :placeholder => "example"
  
       %tr
...	...	@@ -94,6 +94,10 @@ Install gitosis, edit conf/gitosis.yml & start server
94	94
95	95	echo "gem: --no-rdoc --no-ri" > ~/.gemrc
96	96
	97	+== Community
	98	+
	99	+gitlabhq[https://groups.google.com/forum/?hl=en#!forum/gitlabhq] Google Group
	100	+
97	101	== Contribute
98	102
99	103	We develop project on our private server.
...	...
...	...	@@ -19,13 +19,13 @@
19	19	%tr
20	20	%td
21	21	.left= f.label :path
22		- %cite.right git@yourserver:
	22	+ %cite.right= "git@#{GITOSIS["host"]}:"
23	23	%td
24	24	= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
25	25	%tr
26	26	%td
27	27	.left= f.label :code
28		- %cite.right http://yourserver/
	28	+ %cite.right= "http://#{GITOSIS["host"]}/"
29	29	%td= f.text_field :code, :placeholder => "example"
30	30
31	31	%tr
...	...