Merge remote-tracking branch 'tootsuite/master'

Conflicts: app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
parent eb72c3398c 8e88a18316
commit a817f084ea
14 changed files with 160 additions and 32 deletions
--- 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: