[ckan-changes] [ckan/ckan] 7ef468: Merge branch 'master' into poc-flask-views

[GitHub]

  Branch: refs/heads/poc-flask-views.c
  Home:   https://github.com/ckan/ckan
  Commit: 7ef468a261fe0579be415726d178609147b0e051
      https://github.com/ckan/ckan/commit/7ef468a261fe0579be415726d178609147b0e051
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-09 (Tue, 09 Aug 2016)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch 'master' into poc-flask-views


  Commit: 7fc058ddcb7b98c3dbaa8f11740def4f9c53fa4e
      https://github.com/ckan/ckan/commit/7fc058ddcb7b98c3dbaa8f11740def4f9c53fa4e
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-10 (Wed, 10 Aug 2016)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3196] Remove usages of g outside templates

Conflicts:
	ckan/lib/base.py


  Commit: c6b83c339c6c80c02df369f226239cf5ba3d230f
      https://github.com/ckan/ckan/commit/c6b83c339c6c80c02df369f226239cf5ba3d230f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/controllers/home.py
    M ckan/lib/helpers.py
    M ckan/templates/home/about.html
    M ckan/views/api.py

  Log Message:
  -----------
  Test c and g changes


Compare: https://github.com/ckan/ckan/compare/7ef468a261fe^...c6b83c339c6c