diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-28 01:02:43 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-28 01:02:43 -0800 |
| commit | d991ce636b9cda08b50fa216751de0234d36f774 (patch) | |
| tree | 9962a6a903ff8e822c7d1754dc2bf28a46f20102 | |
| parent | 1f3bdd453e8dfb81b97166ede481685d85ea04c6 (diff) | |
| parent | 103bb239e52614baf894876d0c40870244f2c377 (diff) | |
| download | gitlab-ce-d991ce636b9cda08b50fa216751de0234d36f774.tar.gz | |
Merge pull request #2390 from simi/master
No need to install custom phantomjs for travis.
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index ad00ded07cb..59d22f32ee3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ env: - DB=mysql before_install: - sudo apt-get install libicu-dev -y - - wget -P /tmp http://phantomjs.googlecode.com/files/phantomjs-1.7.0-linux-i686.tar.bz2 - - tar -xf /tmp/phantomjs-1.7.0-linux-i686.tar.bz2 -C /tmp/ - - sudo rm -rf /usr/local/phantomjs - - sudo mv /tmp/phantomjs-1.7.0-linux-i686 /usr/local/phantomjs - gem install charlock_holmes -v="0.6.9" branches: only: |