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

README.md

@@ -148,6 +148,8 @@ or start each component separately
 * [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
+* [Gitter](https://gitter.im/gitlabhq/gitlabhq#) here you can ask questions when you need help.
+
 ### Getting in touch

config/application.rb

@@ -62,7 +62,9 @@ module Gitlab
     # Enable the asset pipeline
     config.assets.enabled = true
-
+    config.assets.paths << Emoji.images_path
+    config.assets.precompile << "emoji/*.png"
+    
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

doc/update/5.4-to-6.0.md

@@ -94,7 +94,7 @@ Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
 ```bash
 sudo rm /etc/init.d/gitlab
-sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-0-stable/lib/support/init.d/gitlab
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
 ```

doc/update/6.0-to-6.1.md

@@ -71,7 +71,7 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
 ```bash
 sudo rm /etc/init.d/gitlab
-sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-1-stable/lib/support/init.d/gitlab
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
 ```

doc/update/6.1-to-6.2.md

@@ -87,7 +87,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 ```bash
 sudo rm /etc/init.d/gitlab
-sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-2-stable/lib/support/init.d/gitlab
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
 ```