Download as
Browse Code »

Commit 66d21d54f37eddeb4863b7a2b03f8add3ab8aea1

Authored by Dmitriy Zaporozhets
2 parents 0212bc7a 5e935bfe
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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

Showing 5 changed files with 8 additions and 4 deletions   Show diff stats
@@ -148,6 +148,8 @@ or start each component separately @@ -148,6 +148,8 @@ or start each component separately
148 148
149 * [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview. 149 * [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
150 150
  151 +* [Gitter](https://gitter.im/gitlabhq/gitlabhq#) here you can ask questions when you need help.
  152 +
151 153
152 ### Getting in touch 154 ### Getting in touch
153 155
config/application.rb
  Diff comments   View file @66d21d5
@@ -62,7 +62,9 @@ module Gitlab @@ -62,7 +62,9 @@ module Gitlab
62 62
63 # Enable the asset pipeline 63 # Enable the asset pipeline
64 config.assets.enabled = true 64 config.assets.enabled = true
65 - 65 + config.assets.paths << Emoji.images_path
  66 + config.assets.precompile << "emoji/*.png"
  67 +
66 # Version of your assets, change this if you want to expire all your assets 68 # Version of your assets, change this if you want to expire all your assets
67 config.assets.version = '1.0' 69 config.assets.version = '1.0'
68 70
doc/update/5.4-to-6.0.md
  Diff comments   View file @66d21d5
@@ -94,7 +94,7 @@ Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0. @@ -94,7 +94,7 @@ Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
94 94
95 ```bash 95 ```bash
96 sudo rm /etc/init.d/gitlab 96 sudo rm /etc/init.d/gitlab
97 -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-0-stable/lib/support/init.d/gitlab 97 +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
98 sudo chmod +x /etc/init.d/gitlab 98 sudo chmod +x /etc/init.d/gitlab
99 ``` 99 ```
100 100
doc/update/6.0-to-6.1.md
  Diff comments   View file @66d21d5
@@ -71,7 +71,7 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production @@ -71,7 +71,7 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
71 71
72 ```bash 72 ```bash
73 sudo rm /etc/init.d/gitlab 73 sudo rm /etc/init.d/gitlab
74 -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-1-stable/lib/support/init.d/gitlab 74 +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
75 sudo chmod +x /etc/init.d/gitlab 75 sudo chmod +x /etc/init.d/gitlab
76 ``` 76 ```
77 77
doc/update/6.1-to-6.2.md
  Diff comments   View file @66d21d5
@@ -87,7 +87,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab @@ -87,7 +87,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
87 87
88 ```bash 88 ```bash
89 sudo rm /etc/init.d/gitlab 89 sudo rm /etc/init.d/gitlab
90 -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-2-stable/lib/support/init.d/gitlab 90 +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
91 sudo chmod +x /etc/init.d/gitlab 91 sudo chmod +x /etc/init.d/gitlab
92 ``` 92 ```
93 93