diff --git a/README.md b/README.md index 8280fbd2ca3aac95a547fbd249c301c1961b0c0b..dcd303e08a847449bea19dfaa452f4a96683c6ec 100644 --- a/README.md +++ b/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 diff --git a/config/application.rb b/config/application.rb index 88759ce7cf31c3a4eeff6e989d2950272a4cbe47..c53257090cf93851b18f71f2aa96b86397de1070 100644 --- a/config/application.rb +++ b/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' diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md index a1a406fe7e9492329e3a28053b4851031f3698a8..312e9a4608093a6e4e8c702007f698ee90414764 100644 --- a/doc/update/5.4-to-6.0.md +++ b/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 ``` diff --git a/doc/update/6.0-to-6.1.md b/doc/update/6.0-to-6.1.md index ac8f0a77efd5c030ff32c83e9ccfaad5f61b48b6..b7fd76348599cd9854f588eced1363f311c04ec5 100644 --- a/doc/update/6.0-to-6.1.md +++ b/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 ``` diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md index 7342a9117c6b884fbb058881f56f211836558894..3c453a5ab42739d79be1ecbfd3795a39f693b2f1 100644 --- a/doc/update/6.1-to-6.2.md +++ b/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 ```