[ckan-changes] [okfn/ckan] 57397c: [#1273] fix some tests

[GitHub]

  Branch: refs/heads/1273-resource-uploads
  Home:   https://github.com/okfn/ckan
  Commit: 57397c20b0ceae51b1081c0589c67c9594104e83
      https://github.com/okfn/ckan/commit/57397c20b0ceae51b1081c0589c67c9594104e83
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/uploader.py
    M ckan/logic/action/update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1273] fix some tests


  Commit: 091284965aa43a79607cd6842900ab40b320e291
      https://github.com/okfn/ckan/commit/091284965aa43a79607cd6842900ab40b320e291
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/travis-install-dependencies
    M ckan/controllers/user.py
    M ckan/public/base/css/main.css
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/authorization.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/images/ckan_logo_box.png
    M doc/index.rst
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge branch '1273-resource-uploads' of github.com:okfn/ckan into 1273-resource-uploads


  Commit: 53d6a1f869eb3afdb289305ab31a355ea7fba987
      https://github.com/okfn/ckan/commit/53d6a1f869eb3afdb289305ab31a355ea7fba987
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1273] fix some more tests


Compare: https://github.com/okfn/ckan/compare/29366924e9f6...53d6a1f869eb