diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
| commit | 020b40efdb2e4ddac14bea81ad60512d51eb7fe5 (patch) | |
| tree | b9afe17c1257490af354f76d6e1c1f1b3788e546 /.travis.yml | |
| parent | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (diff) | |
| parent | 235c14c79d620d47012a08425324df222a136457 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index c9a442aed..090041187 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ cache: bundler: true yarn: true directories: - - node_modules - - public/assets - - public/packs-test - - tmp/cache/babel-loader + - node_modules + - public/assets + - public/packs-test + - tmp/cache/babel-loader dist: trusty sudo: false @@ -26,15 +26,15 @@ addons: postgresql: 9.4 apt: sources: - - trusty-media - - sourceline: deb https://dl.yarnpkg.com/debian/ stable main - key_url: https://dl.yarnpkg.com/debian/pubkey.gpg + - trusty-media + - sourceline: deb https://dl.yarnpkg.com/debian/ stable main + key_url: https://dl.yarnpkg.com/debian/pubkey.gpg packages: - - ffmpeg - - libicu-dev - - libprotobuf-dev - - protobuf-compiler - - yarn + - ffmpeg + - libicu-dev + - libprotobuf-dev + - protobuf-compiler + - yarn rvm: - 2.4.2 |