diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-14 12:13:59 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-14 12:13:59 +0200 |
| commit | 66d21d54f37eddeb4863b7a2b03f8add3ab8aea1 (patch) | |
| tree | e21c83736253a634f9b05f242ce576e42335b089 | |
| parent | 0212bc7a0d4440cc873e3de00716ce8c50693631 (diff) | |
| parent | 5e935bfec6cefe0f295858e0d3eddc2d80a91dbd (diff) | |
| download | gitlab-ce-66d21d54f37eddeb4863b7a2b03f8add3ab8aea1.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | doc/update/5.4-to-6.0.md | 2 | ||||
| -rw-r--r-- | doc/update/6.0-to-6.1.md | 2 | ||||
| -rw-r--r-- | doc/update/6.1-to-6.2.md | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/README.md b/README.md index 8280fbd2ca3..dcd303e08a8 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 88759ce7cf3..c53257090cf 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 a1a406fe7e9..312e9a46080 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 ac8f0a77efd..b7fd7634859 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 7342a9117c6..3c453a5ab42 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 ``` |