[ckan-changes] [okfn/ckan] 5e338d: 2866 Missing key results in strip() being called o...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 5e338d9aba56eb4685b015392ed084fc01c80633
      https://github.com/okfn/ckan/commit/5e338d9aba56eb4685b015392ed084fc01c80633
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  2866 Missing key results in strip() being called on None

When no reset key is present then None is used to verify the key
and it is strip()ed first, resulting in an error.


  Commit: f314b5eaba185ea43feda87c08054a4cd812c525
      https://github.com/okfn/ckan/commit/f314b5eaba185ea43feda87c08054a4cd812c525
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Merge branch '2866-missing-reset-key'


  Commit: f0da258544d090b76d6205e3b29b38c1e5793ed1
      https://github.com/okfn/ckan/commit/f0da258544d090b76d6205e3b29b38c1e5793ed1
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


Compare: https://github.com/okfn/ckan/compare/aa710e43529f...f0da258544d0