diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-08 16:18:55 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-08 16:18:55 +0000 |
| commit | f97cb7f11cf2f9a5e01a24d04f6b1c7034ae5828 (patch) | |
| tree | 95bab23cbfdec700432bb35d068ed46080bc8eb1 | |
| parent | 02484930e161f773a205bb1c1d29a8664755fd60 (diff) | |
| parent | da238bbdf43daf167859fcc3dd11a0ca79bac225 (diff) | |
| download | gitlab-ce-f97cb7f11cf2f9a5e01a24d04f6b1c7034ae5828.tar.gz | |
Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | doc/install/installation.md | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c137aec907c..f56311bb5a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ env: - TASK=jasmine:ci before_install: - sudo apt-get install libicu-dev -y - - gem install charlock_holmes -v="0.6.9" branches: only: - 'master' diff --git a/doc/install/installation.md b/doc/install/installation.md index c573727f608..6b84674c19e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -265,8 +265,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. cd /home/git/gitlab - sudo gem install charlock_holmes --version '0.6.9.4' - # For MySQL (note, the option says "without ... postgres") sudo -u git -H bundle install --deployment --without development test postgres aws |