Commit f97cb7f11cf2f9a5e01a24d04f6b1c7034ae5828

Authored by Dmitriy Zaporozhets
2 parents 02484930 da238bbd

Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq

Showing 2 changed files with 0 additions and 3 deletions   Show diff stats
.travis.yml
... ... @@ -9,7 +9,6 @@ env:
9 9 - TASK=jasmine:ci
10 10 before_install:
11 11 - sudo apt-get install libicu-dev -y
12   - - gem install charlock_holmes -v="0.6.9"
13 12 branches:
14 13 only:
15 14 - 'master'
... ...
doc/install/installation.md
... ... @@ -265,8 +265,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
265 265  
266 266 cd /home/git/gitlab
267 267  
268   - sudo gem install charlock_holmes --version '0.6.9.4'
269   -
270 268 # For MySQL (note, the option says "without ... postgres")
271 269 sudo -u git -H bundle install --deployment --without development test postgres aws
272 270  
... ...