[ckan-changes] [okfn/ckan] 72d303: [#285] Remove code in base controller that is not ...

Tue Feb 5 18:37:06 UTC 2013

  Branch: refs/heads/release-v2.0
  Home:   https://github.com/okfn/ckan
  Commit: 72d3036ac461dac08e81877107b87feb45d26e54
      https://github.com/okfn/ckan/commit/72d3036ac461dac08e81877107b87feb45d26e54
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Remove code in base controller that is not used in the ckan codebase

  Commit: 8f91b3ce702dc55d1b68c4542ccea95572b97a5a
      https://github.com/okfn/ckan/commit/8f91b3ce702dc55d1b68c4542ccea95572b97a5a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Re add function mis-used in api controller

  Commit: cdce0fcd538a1ada46fc3f4b9344f1bb32a249e7
      https://github.com/okfn/ckan/commit/cdce0fcd538a1ada46fc3f4b9344f1bb32a249e7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] _make_unicode() still has user

  Commit: df939a035789868af2732fac5aece51c8e47fa41
      https://github.com/okfn/ckan/commit/df939a035789868af2732fac5aece51c8e47fa41
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Merge branch 'master' into 285-base-controller-code-removal

  Commit: 2edc0a875270aad655c0cb66b02f5864c5920582
      https://github.com/okfn/ckan/commit/2edc0a875270aad655c0cb66b02f5864c5920582
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Move function into only function using it

  Commit: 4e4aea6c95b4ad280d4713d3b90fe3574cfad815
      https://github.com/okfn/ckan/commit/4e4aea6c95b4ad280d4713d3b90fe3574cfad815
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Move function into API controller as only user

  Commit: 7e51ec6bc5fcaa80610804738ec66e416e46ab1d
      https://github.com/okfn/ckan/commit/7e51ec6bc5fcaa80610804738ec66e416e46ab1d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#285] Fix missing imports

  Commit: 1d5d602eb28723c3c261f9a8a0aa14e815a1af8a
      https://github.com/okfn/ckan/commit/1d5d602eb28723c3c261f9a8a0aa14e815a1af8a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#285] Use json defined in h

  Commit: fa213d94e5a7d887813d71dffba086fb0540eb41
      https://github.com/okfn/ckan/commit/fa213d94e5a7d887813d71dffba086fb0540eb41
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M ckan/controllers/revision.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  309 no private datasets in activity streams, revisions, group listing and tag listings

  Commit: d294d0dcc9e6c95fdee4ac6aab1068777f6c4fd9
      https://github.com/okfn/ckan/commit/d294d0dcc9e6c95fdee4ac6aab1068777f6c4fd9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [#287] Add is_datastore_supported method to tests and engine_is_pg to model

  Commit: 23c2bcaf93e9f607b57e5421d6274579a0314c4e
      https://github.com/okfn/ckan/commit/23c2bcaf93e9f607b57e5421d6274579a0314c4e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#287] Log warning if the database is not a pg database. Skip datastore tests, if there is no support for them.

  Commit: 6e33f76b18db06e6f1b643cf7f9645daba059ac9
      https://github.com/okfn/ckan/commit/6e33f76b18db06e6f1b643cf7f9645daba059ac9
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  make group_list_dictize reasonably fast by going through search index

  Commit: 2a74c8dc16900ce364a86ddeed746b3f5ac90661
      https://github.com/okfn/ckan/commit/2a74c8dc16900ce364a86ddeed746b3f5ac90661
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/templates/snippets/organization.html
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#309] add package count using search index

  Commit: e024873f596d481137845951af57988b077969fb
      https://github.com/okfn/ckan/commit/e024873f596d481137845951af57988b077969fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#316] Disable follower lists

Disable follower lists for normal users

Make it so that only sysadmins can see a dataset, user or group's list
of followers.

Add auth functions to user, dataset and group follower_list functions.

user controller, group controller, package controller:
  /followers pages send 401 if not authorized

Remove followers tabs from user, dataset and group pages.

Some tests need to be fixed now

  Commit: 44a1fd16956341331e9eb534911a9d08acc6a758
      https://github.com/okfn/ckan/commit/44a1fd16956341331e9eb534911a9d08acc6a758
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#316] Update follower api tests

Make it pass a sysadmin's API key whenever calling *_follower_list,
since only sysadmins are authorised to call that now.

  Commit: 40e4630d24a81b3294d31d93d5b942f02713acff
      https://github.com/okfn/ckan/commit/40e4630d24a81b3294d31d93d5b942f02713acff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  [#316] Update follower frontend tests

  Commit: 825117eca63105ac582b7708f3dde242499c30db
      https://github.com/okfn/ckan/commit/825117eca63105ac582b7708f3dde242499c30db
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#316] Add tests for new follower list auth

  Commit: 5c7e022a09798d02b1fd30356517a9ef071d0577
      https://github.com/okfn/ckan/commit/5c7e022a09798d02b1fd30356517a9ef071d0577
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Remove "started following" activities

  Commit: a20d0b3f9aa5cf65d1f9780a98a7faaff90f6ab7
      https://github.com/okfn/ckan/commit/a20d0b3f9aa5cf65d1f9780a98a7faaff90f6ab7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  [#316] Update activity streams API tests

  Commit: b722815983378201dba41a4b2adc36c4430aafac
      https://github.com/okfn/ckan/commit/b722815983378201dba41a4b2adc36c4430aafac
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/test_activity.py

  Log Message:
  -----------
  [#316] Update activity streams frontend tests

  Commit: ef89d80549214276f5c3f7ee08c50ce28597a44e
      https://github.com/okfn/ckan/commit/ef89d80549214276f5c3f7ee08c50ce28597a44e
  Author: John Glover <j at johnglover.net>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Remove theme folder from gitignore

  Commit: bd807829965929b63059d4445b3cf76387086ae8
      https://github.com/okfn/ckan/commit/bd807829965929b63059d4445b3cf76387086ae8
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch '330-fix-gitignore'

  Commit: 7f4f0def48560951d0d171e2665dfeefaad80e82
      https://github.com/okfn/ckan/commit/7f4f0def48560951d0d171e2665dfeefaad80e82
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#316] Add auth for followee_list APIs

Don't let visitors or other users see what a user is following.

  Commit: 6903985d1f89e8de59434ce1fdd7da3d96aaa204
      https://github.com/okfn/ckan/commit/6903985d1f89e8de59434ce1fdd7da3d96aaa204
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore
    M ckan/lib/helpers.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 316-disable-follower-lists

  Commit: 6adc06072ad1535e5671ad3142a16408cae60cb5
      https://github.com/okfn/ckan/commit/6adc06072ad1535e5671ad3142a16408cae60cb5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Removed 'follow dataset' and 'follow group' activities

Forgot to remove these in earlier commit
5c7e022a09798d02b1fd30356517a9ef071d0577

  Commit: 99920836a6ee3ed4a4d8f4812ae28918d0278ee7
      https://github.com/okfn/ckan/commit/99920836a6ee3ed4a4d8f4812ae28918d0278ee7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  [#316] Update user dashboard tests

  Commit: 7ea77f068fff68e669b3dafc69d31515ff535c55
      https://github.com/okfn/ckan/commit/7ea77f068fff68e669b3dafc69d31515ff535c55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py

  Log Message:
  -----------
  [#316] Update some more activity streams tests

  Commit: 7f938970f77ac1c710acf7f6d7141bfb85308c11
      https://github.com/okfn/ckan/commit/7f938970f77ac1c710acf7f6d7141bfb85308c11
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore
    M ckan/lib/helpers.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 287-datastore-tests-only-on-pg

  Commit: 4313177506f73797d590c8c10174460f793637da
      https://github.com/okfn/ckan/commit/4313177506f73797d590c8c10174460f793637da
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Merge branch '287-datastore-tests-only-on-pg'

  Commit: 01ccbbac5d97d3077cdc471bb39716c1ea03f91f
      https://github.com/okfn/ckan/commit/01ccbbac5d97d3077cdc471bb39716c1ea03f91f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  [#345] Also recognize driver `postgres` in `engine_is_pg`

  Commit: 6c0c8957d8fd9d0187214072ed38dbecb26ae665
      https://github.com/okfn/ckan/commit/6c0c8957d8fd9d0187214072ed38dbecb26ae665
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Merge branch 'master' into 316-disable-follower-lists

  Commit: ca1a7d76aaa2f8949a5150e886a993d9a3a142c4
      https://github.com/okfn/ckan/commit/ca1a7d76aaa2f8949a5150e886a993d9a3a142c4
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  Merge branch '316-disable-follower-lists'

  Commit: e5485d9e21fd91ba9d4a633f915c16dd7d2921f9
      https://github.com/okfn/ckan/commit/e5485d9e21fd91ba9d4a633f915c16dd7d2921f9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 345-fix-pg-detection

  Commit: 854a0e611a3a4701c09c70ef3bfb81111af04163
      https://github.com/okfn/ckan/commit/854a0e611a3a4701c09c70ef3bfb81111af04163
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  Merge branch '345-fix-pg-detection'

  Commit: 5fb318e05c40717946940ca8bd94fda118db50f0
      https://github.com/okfn/ckan/commit/5fb318e05c40717946940ca8bd94fda118db50f0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M .gitignore
    M README.rst
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 309-package-private-everywhere

  Commit: a915602a6a2c2be580ffddcf7012076a04ff5810
      https://github.com/okfn/ckan/commit/a915602a6a2c2be580ffddcf7012076a04ff5810
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py

  Log Message:
  -----------
  [#309] Tidy up a couple of comments

No point in putting "TODO" comments in the source code no one will
remember to go back and do them and the comment may become outdated/misleading.

  Commit: 72373a205becf3f16ab4c0833f25d49c931623dc
      https://github.com/okfn/ckan/commit/72373a205becf3f16ab4c0833f25d49c931623dc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/templates/snippets/organization.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Merge branch '309-package-private-everywhere'

  Commit: 680c58fffde62c6834cfb006f94d7eb1ab592845
      https://github.com/okfn/ckan/commit/680c58fffde62c6834cfb006f94d7eb1ab592845
  Author: John Glover <j at johnglover.net>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] PEP8

  Commit: 4fe7b50f7365ae686d4fb7d7d2deb778e782964d
      https://github.com/okfn/ckan/commit/4fe7b50f7365ae686d4fb7d7d2deb778e782964d
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  Merge pull request #285 from okfn/285-base-controller-code-removal

Clean BaseController

  Commit: dfc7da6f0d3bf72794362582e6ee73fd7eb16474
      https://github.com/okfn/ckan/commit/dfc7da6f0d3bf72794362582e6ee73fd7eb16474
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M .gitignore
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Merge branch 'master' into release-v2.0

Compare: https://github.com/okfn/ckan/compare/37f129741a9f...dfc7da6f0d3b