[ckan-changes] [okfn/ckan] 146568: [#1393] user_dictize: return apikey correctly

Mon Dec 16 11:56:27 UTC 2013

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 146568aff928d9b090dc4ce8d9a4bf64e95a2aea
      https://github.com/okfn/ckan/commit/146568aff928d9b090dc4ce8d9a4bf64e95a2aea
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#1393] user_dictize: return apikey correctly

Was returning email instead of apikey. Fixes #1393

  Commit: e3764371f8862f49d497e548d4235fb11d87da68
      https://github.com/okfn/ckan/commit/e3764371f8862f49d497e548d4235fb11d87da68
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  [#1392] more fixes from awful commit + tests

  Commit: 9a2840b78ee292841147e96a6bdaa6b9a693002f
      https://github.com/okfn/ckan/commit/9a2840b78ee292841147e96a6bdaa6b9a693002f
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-15 (Sun, 15 Dec 2013)

  Changed paths:
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  [#1392] pep8 fix

  Commit: 4a89b781c838a86b98a637d09700a3a0f4388afc
      https://github.com/okfn/ckan/commit/4a89b781c838a86b98a637d09700a3a0f4388afc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch '1393-bug-user-create-returns-email-for-api-key'

Compare: https://github.com/okfn/ckan/compare/6213f0d5c524...4a89b781c838