diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
commit | a817f084eafaf5527445c29ab1d68f42b1a2872f (patch) | |
tree | f146e6c8ff958d60804e33e40e1970784f5b7b90 /.travis.yml | |
parent | eb72c3398cd70c6b595fae5a0cb6730a3e49bd61 (diff) | |
parent | 8e88a18316d45a459a31d67487bccc247592d187 (diff) |
Merge remote-tracking branch 'tootsuite/master'
Conflicts: app/controllers/statuses_controller.rb
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3ac83e0e3..d5efd9703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ env: - LOCAL_HTTPS=true - RAILS_ENV=test - PARALLEL_TEST_PROCESSORS=2 + - ALLOW_NOPAM=true addons: postgresql: 9.4 @@ -43,7 +44,7 @@ services: install: - nvm install - - bundle install --path=vendor/bundle --without development production --retry=3 --jobs=16 + - bundle install --path=vendor/bundle --with pam_authentication --without development production --retry=3 --jobs=16 - yarn install before_script: |