Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io

 into jobs-and-schools-v2

* 'develop' of https://github.com/CenterForOpenScience/osf.io: (87 commits)
  Bump version and update changelog
  fix tests for non-dict based client attributes
  Update gitlab serializers for fangorn config js
  Add enforce_csrf waffle switch so that this can be merged earlier
  Update markdown-it-video with infinite loop fix
  Fix indentation
  Improve tests by using user cookie method and faster user creation
  Tests to ensure API requests with Session auth fail without CSRF protection
  Travis and Test Speed ups
  Rename --quick to --all
  Don't transact to avoid deadlocks
  Add script to fix poor mapping logic -h/t @caseyrollins
  Add same enforce_csrf method as drf's SessionAuthentication
  replace bad reverse migration with warning
  Use timezone.now() when checking for failed registrations
  Remove duplicate psyarxiv custom subject.
  Use fork of celery 4.2.1 with celery/celery#4839 merged
  Upgrade celery and kombu
  Set TIME_ZONE in settings
  add scheme to match UI
  ...

.travis.yml

@@ -34,7 +34,7 @@ env:
     - BOTO_CONFIG=/dev/null
   matrix:
     - TEST_BUILD="addons"
-    - TEST_BUILD="else"
+    - TEST_BUILD="website"
     - TEST_BUILD="api1_and_js"
     - TEST_BUILD="api2"
     - TEST_BUILD="api3_and_osf"
@@ -131,24 +131,28 @@ install:
     - travis_retry pip install flake8==2.4.0 --force-reinstall --upgrade
     - travis_retry invoke wheelhouse --dev --addons
 
-    - nvm install 8.6.0
-    - nvm use 8.6.0
-    - curl -o- -L https://yarnpkg.com/install.sh | bash
-    - export PATH=$HOME/.yarn/bin:$PATH
+    - |
+      if [ "$TEST_BUILD" = "api1_and_js" ]; then
+       nvm install 8.6.0
+       nvm use 8.6.0
+       curl -o- -L https://yarnpkg.com/install.sh | bash
+       export PATH=$HOME/.yarn/bin:$PATH
+       travis_retry invoke assets --dev
+      fi
 
     - travis_retry invoke travis_addon_settings
     - travis_retry invoke requirements --dev --addons
     # Hack to fix package conflict between uritemplate and uritemplate.py (dependency of github3.py)
     - pip uninstall uritemplate.py --yes
     - pip install uritemplate.py==0.3.0
-    - travis_retry invoke assets --dev
 
 # Run Python tests (core and addon) and JS tests
 script:
-    - invoke test_travis_$TEST_BUILD -n 4
+    - export COVERAGE=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "--coverage"; else echo ""; fi`
+    - invoke test_travis_$TEST_BUILD -n 4 $COVERAGE
 
 after_success:
-    - coveralls || true
+    - if [[ "$TRAVIS_BRANCH" == "master" ]]; then coveralls; fi
 
 before_cache:
   - rm -Rf $HOME/.cache/pip/http

CHANGELOG

@@ -2,8 +2,28 @@
 Changelog
 *********
 
+0.149.0 (2018-07-22)
+====================
+
+- Remove "Copy citations" button for Zotero folders and optimize loading large folders.
+- Improve speed of test suite.
+- Admin: Add ability to remove stuck registrations
+
+0.148.0 (2018-07-18)
+====================
+
+- Create RegistrationProvider model
+- Create PreprintWithdrawalRequest model
+- Add collections logos to project overview
+- Return None relationships for withdrawn preprints
+- Fix "Other" Subject ordering
+- Replace OSF-internal usage of preprint assets with ProviderAssetFiles
+- Fix preprint download permissions checking
+- Fix collectionSubmission ES mapping
+
 0.147.0 (2018-07-11)
 ====================
+
 - Add choices for ProviderAssetFileNames
 - Add Comments to Reviews email
 - Add ProviderAssetFile API endpoints, AbstractProvider relationship
@@ -56,6 +76,7 @@ Changelog
 
 0.142.0 (2018-05-29)
 ====================
+
 - Add UI with metadata when a project is in a public collection
 - Add /v2/providers/<type> routes, version out /preprint_providers/
 - Add post-submission call-to-action emails for preprints