[ckan-changes] [ckan/ckan] ae47bc: Added a unit test for having both a root_path and ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: ae47bca674253f5f4769cd1567256cb8d7ddce66
      https://github.com/ckan/ckan/commit/ae47bca674253f5f4769cd1567256cb8d7ddce66
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Added a unit test for having both a root_path and SCRIPT_NAME env


  Commit: 9cf0369865fc355ef5fe6f714ac3a159830be58f
      https://github.com/ckan/ckan/commit/9cf0369865fc355ef5fe6f714ac3a159830be58f
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Fixed the url_for_* helpers when both SCRIPT_NAME and ckan.root_path are defined


  Commit: 21959755ba8246dd63760d2f18c3d41f234d9ca2
      https://github.com/ckan/ckan/commit/21959755ba8246dd63760d2f18c3d41f234d9ca2
  Author: Ian Ward <ian at excess.org>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M ckan/tests/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#2936] move extra_environ change to decorator


  Commit: 55e38e4e49db8ded73b1bcbd6b688ad94a1c9dc3
      https://github.com/ckan/ckan/commit/55e38e4e49db8ded73b1bcbd6b688ad94a1c9dc3
  Author: Ian Ward <ian at excess.org>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    A .circleci-matrix.yml
    M CHANGELOG.rst
    M circle.yml
    M ckan/model/modification.py
    M ckan/templates/footer.html
    A ckan/tests/i18n/__init__.py
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch 'master' into fix-script-name


Compare: https://github.com/ckan/ckan/compare/291c60a83a34...55e38e4e49db