Skip to content

G
gitlab-ce
Commit f97cb7f1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

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

parents 02484930 da238bbd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
.travis.yml
View file @ f97cb7f1
...@@ -9,7 +9,6 @@ env: ...@@ -9,7 +9,6 @@ env:
- TASK=jasmine:ci - TASK=jasmine:ci
before_install: before_install:
- sudo apt-get install libicu-dev -y - sudo apt-get install libicu-dev -y
- gem install charlock_holmes -v="0.6.9"
branches: branches:
only: only:
- 'master' - 'master'
......
doc/install/installation.md
View file @ f97cb7f1
...@@ -265,8 +265,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. ...@@ -265,8 +265,6 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
cd /home/git/gitlab cd /home/git/gitlab
sudo gem install charlock_holmes --version '0.6.9.4'
# For MySQL (note, the option says "without ... postgres") # For MySQL (note, the option says "without ... postgres")
sudo -u git -H bundle install --deployment --without development test postgres aws sudo -u git -H bundle install --deployment --without development test postgres aws
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7