[ckan-changes] [ckan/ckan] 330d50: write migrations

Tue May 14 21:01:25 UTC 2019

  Branch: refs/heads/reintroduce-extras_list
  Home:   https://github.com/ckan/ckan
  Commit: 330d5023dffa664334d0a71ed99888342dd321bf
      https://github.com/ckan/ckan/commit/330d5023dffa664334d0a71ed99888342dd321bf
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-09-10 (Mon, 10 Sep 2018)

  Changed paths:
    M .gitignore
    M ckan/migration/README
    A ckan/migration/alembic.ini
    A ckan/migration/env.py
    R ckan/migration/manage.py
    R ckan/migration/migrate.cfg
    A ckan/migration/script.py.mako
    A ckan/migration/versions/001_103676e0a497_create_existing_tables.py
    R ckan/migration/versions/001_add_existing_tables.py
    A ckan/migration/versions/002_86fdd8c54775_add_author_and_maintainer.py
    R ckan/migration/versions/002_add_author_and_maintainer.py
    R ckan/migration/versions/003_add_user_object.py
    A ckan/migration/versions/003_f22b4f5241a5_add_user_object.py
    R ckan/migration/versions/004_add_group_object.py
    A ckan/migration/versions/004_f92ee205e46d_add_group_object.py
    A ckan/migration/versions/005_12c2232c15f5_add_authorization_tables.py
    R ckan/migration/versions/005_add_authorization_tables.py
    R ckan/migration/versions/006_add_ratings.py
    A ckan/migration/versions/006_c83955e7acb6_add_ratings.py
    A ckan/migration/versions/007_1928d4af1cda_add_system_roles.py
    R ckan/migration/versions/007_add_system_roles.py
    A ckan/migration/versions/008_e8283ffb257e_update_vdm_ids.py
    R ckan/migration/versions/008_update_vdm_ids.py
    R ckan/migration/versions/009_add_creation_timestamps.py
    A ckan/migration/versions/009_b739a48de5c4_add_creation_timestamps.py
    A ckan/migration/versions/010_a6f13bf14d0c_add_user_about.py
    R ckan/migration/versions/010_add_user_about.py
    A ckan/migration/versions/011_866f6370b4ac_add_package_search_vector.py
    R ckan/migration/versions/011_add_package_search_vector.py
    R ckan/migration/versions/012_add_resources.py
    A ckan/migration/versions/012_e5ca33a5d445_add_resources.py
    A ckan/migration/versions/013_8a3a5af39797_add_hash.py
    R ckan/migration/versions/013_add_hash.py
    A ckan/migration/versions/014_93519b684820_hash_2.py
    R ckan/migration/versions/014_hash_2.py
    A ckan/migration/versions/015_6d8ffebcaf54_remove_state_object.py
    R ckan/migration/versions/015_remove_state_object.py
    A ckan/migration/versions/016_37ada738328e_uuids_everywhere.py
    R ckan/migration/versions/016_uuids_everywhere.py
    A ckan/migration/versions/017_1250b2ff3e36_add_pkg_relationships.py
    R ckan/migration/versions/017_add_pkg_relationships.py
    A ckan/migration/versions/018_05a0778051ca_adjust_licenses.py
    R ckan/migration/versions/018_adjust_licenses.py
    A ckan/migration/versions/019_b2eb6f34a638_pkg_relationships_state.py
    R ckan/migration/versions/019_pkg_relationships_state.py
    A ckan/migration/versions/020_69a0b0efc609_add_changeset.py
    R ckan/migration/versions/020_add_changeset.py
    A ckan/migration/versions/021_765143af2ba3_postgresql_upgrade_sql.py
    R ckan/migration/versions/021_postgres_downgrade.sql
    R ckan/migration/versions/021_postgres_upgrade.sql
    R ckan/migration/versions/021_postgresql_downgrade.sql
    R ckan/migration/versions/021_postgresql_upgrade.sql
    A ckan/migration/versions/022_7b324ca6c0dc_add_group_extras.py
    R ckan/migration/versions/022_add_group_extras.py
    A ckan/migration/versions/023_87fdd05f0744_add_harvesting.py
    R ckan/migration/versions/023_add_harvesting.py
    A ckan/migration/versions/024_12981fe12484_add_harvested_document.py
    R ckan/migration/versions/024_add_harvested_document.py
    R ckan/migration/versions/025_add_authorization_groups.py
    A ckan/migration/versions/025_b581622ad327_add_authorization_groups.py
    A ckan/migration/versions/026_3615b25af443_authorization_group_user_pk.py
    R ckan/migration/versions/026_authorization_group_user_pk.py
    A ckan/migration/versions/027_11e5745c6fc9_adjust_harvester.py
    R ckan/migration/versions/027_adjust_harvester.py
    A ckan/migration/versions/028_cdd68fe9ba21_drop_harvest_source_status.py
    R ckan/migration/versions/028_drop_harvest_source_status.py
    A ckan/migration/versions/029_1bfdf4240915_version_groups.py
    R ckan/migration/versions/029_version_groups.py
    R ckan/migration/versions/030_additional_user_attributes.py
    A ckan/migration/versions/030_b16cbf164c8a_additional_user_attributes.py
    A ckan/migration/versions/031_1b05245167d6_move_openid_to_new_field.py
    R ckan/migration/versions/031_move_openid_to_new_field.py
    R ckan/migration/versions/032_add_extra_info_field_to_resources.py
    A ckan/migration/versions/032_d89e0731422d_add_extra_info_field_to_resources.py
    A ckan/migration/versions/033_6da92ef2df15_auth_group_user_id_add_conditional.py
    R ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    A ckan/migration/versions/034_6c600693af5b_resource_group_table.py
    R ckan/migration/versions/034_resource_group_table.py
    A ckan/migration/versions/035_81148ccebd6c_harvesting_doc_versioning.py
    R ckan/migration/versions/035_harvesting_doc_versioning.py
    A ckan/migration/versions/036_ecaa8b38782f_lockdown_roles.py
    R ckan/migration/versions/036_lockdown_roles.py
    A ckan/migration/versions/037_edcf3b8c3c1b_role_anon_editor.py
    R ckan/migration/versions/037_role_anon_editor.py
    R ckan/migration/versions/038_delete_migration_tables.py
    A ckan/migration/versions/038_fd6622e3d964_delete_migration_tables.py
    R ckan/migration/versions/039_add_expired_id_and_dates.py
    A ckan/migration/versions/039_cca459c76d45_add_expired_id_and_dates.py
    A ckan/migration/versions/040_500a08f4818e_reset_key_on_user.py
    R ckan/migration/versions/040_reset_key_on_user.py
    A ckan/migration/versions/041_6817d4e3bdc3_resource_new_fields.py
    R ckan/migration/versions/041_resource_new_fields.py
    A ckan/migration/versions/042_da65e2877034_user_revision_indexes.py
    R ckan/migration/versions/042_user_revision_indexes.py
    A ckan/migration/versions/043_bd38cd6502b2_drop_postgres_search.py
    R ckan/migration/versions/043_drop_postgres_search.py
    A ckan/migration/versions/044_4190eeeb8d73_add_task_status.py
    R ckan/migration/versions/044_add_task_status.py
    A ckan/migration/versions/045_54e3f155d945_user_name_unique.py
    R ckan/migration/versions/045_user_name_unique.py
    A ckan/migration/versions/046_b69e9b80396f_drop_changesets.py
    R ckan/migration/versions/046_drop_changesets.py
    A ckan/migration/versions/047_883a7c406926_rename_package_group_member.py
    R ckan/migration/versions/047_rename_package_group_member.py
    A ckan/migration/versions/048_4a7011172b3f_add_activity_streams_tables.py
    R ckan/migration/versions/048_add_activity_streams_tables.py
    R ckan/migration/versions/049_add_group_approval_status.py
    A ckan/migration/versions/049_e0c06c2177b5_add_group_approval_status.py
    A ckan/migration/versions/050_01a6b058cb7f_term_translation_table.py
    R ckan/migration/versions/050_term_translation_table.py
    A ckan/migration/versions/051_a4fb0d85ced6_add_tag_vocabulary.py
    R ckan/migration/versions/051_add_tag_vocabulary.py
    A ckan/migration/versions/052_ba693d64c6d7_update_member_capacities.py
    R ckan/migration/versions/052_update_member_capacities.py
    A ckan/migration/versions/053_9d051a099097_add_group_logo.py
    R ckan/migration/versions/053_add_group_logo.py
    R ckan/migration/versions/054_add_resource_created_date.py
    A ckan/migration/versions/054_da21b38da4db_add_resource_created_date.py
    A ckan/migration/versions/055_048f7db947bf_update_user_and_activity_detail.py
    R ckan/migration/versions/055_update_user_and_activity_detail.py
    A ckan/migration/versions/056_11af3215ae89_add_related_table.py
    R ckan/migration/versions/056_add_related_table.py
    A ckan/migration/versions/057_660a5aae527e_tracking.py
    R ckan/migration/versions/057_tracking.py
    R ckan/migration/versions/058_add_follower_tables.py
    A ckan/migration/versions/058_bd36d1826a5d_add_follower_tables.py
    A ckan/migration/versions/059_9291bb46f352_add_related_count_and_flag.py
    R ckan/migration/versions/059_add_related_count_and_flag.py
    A ckan/migration/versions/060_31ad11c518fc_add_system_info_table.py
    R ckan/migration/versions/060_add_system_info_table.py
    A ckan/migration/versions/061_338d460bc460_add_follower_group_table.py
    R ckan/migration/versions/061_add_follower__group_table.py
    A ckan/migration/versions/062_6deb2bbab394_add_dashboard_table.py
    R ckan/migration/versions/062_add_dashboard_table.py
    A ckan/migration/versions/063_8b633852cb7a_org_changes.py
    R ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_4f8becd4919a_add_email_last_sent_column.py
    R ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_1fab0bc6439e_add_email_notifications_preference.py
    R ckan/migration/versions/065_add_email_notifications_preference.py
    A ckan/migration/versions/066_ad16b3bd8cb6_default_package_type.py
    R ckan/migration/versions/066_default_package_type.py
    A ckan/migration/versions/067_266c110eafec_turn_extras_to_strings.py
    R ckan/migration/versions/067_turn_extras_to_strings.py
    R ckan/migration/versions/068_add_package_extras_index.py
    A ckan/migration/versions/068_e33a5f2b2a84_add_package_extras_index.py
    A ckan/migration/versions/069_e7524c675cdb_resource_url_and_metadata_modified.py
    R ckan/migration/versions/069_resource_url_and_metadata_modified.py
    R ckan/migration/versions/070_add_activity_and_resource_indexes.py
    A ckan/migration/versions/070_cfb544112fa7_add_activity_and_resource_indexes.py
    R ckan/migration/versions/071_add_state_column_to_user_table.py
    A ckan/migration/versions/071_c16f081ef73a_add_state_column_to_user_table.py
    A ckan/migration/versions/072_08dcb9233ad7_add_resource_view.py
    R ckan/migration/versions/072_add_resource_view.py
    A ckan/migration/versions/073_011f51208be3_update_resource_view_resource_id_.py
    R ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    A ckan/migration/versions/074_a4ca55f0f45e_remove_resource_groups.py
    R ckan/migration/versions/074_remove_resource_groups.py
    A ckan/migration/versions/075_9cdc88c8896a_rename_view_plugins.py
    R ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_59995aa965c0_rename_view_plugins_2.py
    R ckan/migration/versions/076_rename_view_plugins_2.py
    A ckan/migration/versions/077_51171a04d86d_add_revisions_to_system_info.py
    R ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_ae821876532a_remove_old_authz_model.py
    R ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_e0177a15d2c9_resource_revision_index.py
    R ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_8224d872c64f_continuity_id_indexes.py
    R ckan/migration/versions/080_continuity_id_indexes.py
    A ckan/migration/versions/081_a64cf4a79182_set_datastore_active.py
    R ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_8ea886d0ede4_create_index_creator_user_id.py
    R ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py
    R ckan/migration/versions/083_remove_related_items.py
    R ckan/migration/versions/084_add_metadata_created.py
    A ckan/migration/versions/084_d85ce5783688_add_metadata_created.py
    R ckan/migration/versions/085_adjust_activity_timestamps.py
    A ckan/migration/versions/085_f9bf3d5c4b4d_adjust_activity_timestamps.py
    A ckan/migration/versions/086_19663581b3bb_drop_openid_column.py
    R ckan/migration/versions/086_drop_openid_column.py
    A ckan/migration/versions/087_ff1b303cab77_remove_old_authorization_tables.py
    R ckan/migration/versions/087_remove_old_authorization_tables.py
    R ckan/migration/versions/__init__.py
    M requirements.txt

  Log Message:
  -----------
  write migrations

  Commit: de195e9f0d09953781d99a5fd870a68f3624cd81
      https://github.com/ckan/ckan/commit/de195e9f0d09953781d99a5fd870a68f3624cd81
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-09-17 (Mon, 17 Sep 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/templates/package/base.html
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/test_helpers.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into alembic

  Commit: c77d9d8f499240e0b180b4c4bb9ed082c1467965
      https://github.com/ckan/ckan/commit/c77d9d8f499240e0b180b4c4bb9ed082c1467965
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-09-20 (Thu, 20 Sep 2018)

  Changed paths:
    M ckan/config/middleware/pylons_app.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/migration/__init__.py
    M ckan/migration/env.py
    M ckan/migration/versions/001_103676e0a497_create_existing_tables.py
    M ckan/migration/versions/002_86fdd8c54775_add_author_and_maintainer.py
    M ckan/migration/versions/003_f22b4f5241a5_add_user_object.py
    M ckan/migration/versions/004_f92ee205e46d_add_group_object.py
    M ckan/migration/versions/005_12c2232c15f5_add_authorization_tables.py
    M ckan/migration/versions/006_c83955e7acb6_add_ratings.py
    M ckan/migration/versions/007_1928d4af1cda_add_system_roles.py
    M ckan/migration/versions/008_e8283ffb257e_update_vdm_ids.py
    M ckan/migration/versions/009_b739a48de5c4_add_creation_timestamps.py
    M ckan/migration/versions/010_a6f13bf14d0c_add_user_about.py
    M ckan/migration/versions/011_866f6370b4ac_add_package_search_vector.py
    M ckan/migration/versions/012_e5ca33a5d445_add_resources.py
    M ckan/migration/versions/013_8a3a5af39797_add_hash.py
    M ckan/migration/versions/014_93519b684820_hash_2.py
    M ckan/migration/versions/015_6d8ffebcaf54_remove_state_object.py
    M ckan/migration/versions/016_37ada738328e_uuids_everywhere.py
    M ckan/migration/versions/017_1250b2ff3e36_add_pkg_relationships.py
    M ckan/migration/versions/018_05a0778051ca_adjust_licenses.py
    M ckan/migration/versions/019_b2eb6f34a638_pkg_relationships_state.py
    M ckan/migration/versions/020_69a0b0efc609_add_changeset.py
    M ckan/migration/versions/021_765143af2ba3_postgresql_upgrade_sql.py
    M ckan/migration/versions/022_7b324ca6c0dc_add_group_extras.py
    M ckan/migration/versions/023_87fdd05f0744_add_harvesting.py
    M ckan/migration/versions/024_12981fe12484_add_harvested_document.py
    M ckan/migration/versions/025_b581622ad327_add_authorization_groups.py
    M ckan/migration/versions/026_3615b25af443_authorization_group_user_pk.py
    M ckan/migration/versions/027_11e5745c6fc9_adjust_harvester.py
    M ckan/migration/versions/028_cdd68fe9ba21_drop_harvest_source_status.py
    M ckan/migration/versions/029_1bfdf4240915_version_groups.py
    M ckan/migration/versions/030_b16cbf164c8a_additional_user_attributes.py
    M ckan/migration/versions/031_1b05245167d6_move_openid_to_new_field.py
    M ckan/migration/versions/032_d89e0731422d_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_6da92ef2df15_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_6c600693af5b_resource_group_table.py
    M ckan/migration/versions/035_81148ccebd6c_harvesting_doc_versioning.py
    M ckan/migration/versions/036_ecaa8b38782f_lockdown_roles.py
    M ckan/migration/versions/037_edcf3b8c3c1b_role_anon_editor.py
    M ckan/migration/versions/038_fd6622e3d964_delete_migration_tables.py
    M ckan/migration/versions/039_cca459c76d45_add_expired_id_and_dates.py
    M ckan/migration/versions/040_500a08f4818e_reset_key_on_user.py
    M ckan/migration/versions/041_6817d4e3bdc3_resource_new_fields.py
    M ckan/migration/versions/042_da65e2877034_user_revision_indexes.py
    M ckan/migration/versions/043_bd38cd6502b2_drop_postgres_search.py
    M ckan/migration/versions/044_4190eeeb8d73_add_task_status.py
    M ckan/migration/versions/045_54e3f155d945_user_name_unique.py
    M ckan/migration/versions/046_b69e9b80396f_drop_changesets.py
    M ckan/migration/versions/047_883a7c406926_rename_package_group_member.py
    M ckan/migration/versions/048_4a7011172b3f_add_activity_streams_tables.py
    M ckan/migration/versions/049_e0c06c2177b5_add_group_approval_status.py
    M ckan/migration/versions/050_01a6b058cb7f_term_translation_table.py
    M ckan/migration/versions/051_a4fb0d85ced6_add_tag_vocabulary.py
    M ckan/migration/versions/052_ba693d64c6d7_update_member_capacities.py
    M ckan/migration/versions/053_9d051a099097_add_group_logo.py
    M ckan/migration/versions/054_da21b38da4db_add_resource_created_date.py
    M ckan/migration/versions/055_048f7db947bf_update_user_and_activity_detail.py
    M ckan/migration/versions/056_11af3215ae89_add_related_table.py
    M ckan/migration/versions/057_660a5aae527e_tracking.py
    M ckan/migration/versions/058_bd36d1826a5d_add_follower_tables.py
    M ckan/migration/versions/059_9291bb46f352_add_related_count_and_flag.py
    M ckan/migration/versions/060_31ad11c518fc_add_system_info_table.py
    M ckan/migration/versions/061_338d460bc460_add_follower_group_table.py
    M ckan/migration/versions/062_6deb2bbab394_add_dashboard_table.py
    M ckan/migration/versions/063_8b633852cb7a_org_changes.py
    M ckan/migration/versions/064_4f8becd4919a_add_email_last_sent_column.py
    M ckan/migration/versions/065_1fab0bc6439e_add_email_notifications_preference.py
    M ckan/migration/versions/066_ad16b3bd8cb6_default_package_type.py
    M ckan/migration/versions/067_266c110eafec_turn_extras_to_strings.py
    M ckan/migration/versions/068_e33a5f2b2a84_add_package_extras_index.py
    M ckan/migration/versions/069_e7524c675cdb_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_cfb544112fa7_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_c16f081ef73a_add_state_column_to_user_table.py
    M ckan/migration/versions/072_08dcb9233ad7_add_resource_view.py
    M ckan/migration/versions/073_011f51208be3_update_resource_view_resource_id_.py
    M ckan/migration/versions/074_a4ca55f0f45e_remove_resource_groups.py
    M ckan/migration/versions/075_9cdc88c8896a_rename_view_plugins.py
    M ckan/migration/versions/076_59995aa965c0_rename_view_plugins_2.py
    M ckan/migration/versions/077_51171a04d86d_add_revisions_to_system_info.py
    M ckan/migration/versions/078_ae821876532a_remove_old_authz_model.py
    M ckan/migration/versions/079_e0177a15d2c9_resource_revision_index.py
    M ckan/migration/versions/080_8224d872c64f_continuity_id_indexes.py
    M ckan/migration/versions/081_a64cf4a79182_set_datastore_active.py
    M ckan/migration/versions/082_8ea886d0ede4_create_index_creator_user_id.py
    M ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py
    M ckan/migration/versions/084_d85ce5783688_add_metadata_created.py
    M ckan/migration/versions/085_f9bf3d5c4b4d_adjust_activity_timestamps.py
    M ckan/migration/versions/086_19663581b3bb_drop_openid_column.py
    M ckan/migration/versions/087_ff1b303cab77_remove_old_authorization_tables.py
    A ckan/migration/versions/088_3ad397f70903_remove_migrate_version_table.py
    M ckan/model/__init__.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Update CLI

  Commit: 1dee1bb323f8608121c255663278775d3e2a4b70
      https://github.com/ckan/ckan/commit/1dee1bb323f8608121c255663278775d3e2a4b70
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M ckan/migration/__init__.py
    M ckan/migration/alembic.ini
    M ckan/migration/versions/088_3ad397f70903_remove_migrate_version_table.py
    M ckan/model/__init__.py

  Log Message:
  -----------
  Suggested improvements and comments

  Commit: ec08475a68a38279f21cb23982102a109332d6fe
      https://github.com/ckan/ckan/commit/ec08475a68a38279f21cb23982102a109332d6fe
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M .github/ISSUE_TEMPLATE.md
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    A bin/remove-old-git-branches.sh
    M ckan/authz.py
    A ckan/cli/__init__.py
    A ckan/cli/cli.py
    A ckan/cli/config_tool.py
    A ckan/cli/db.py
    A ckan/cli/search_index.py
    A ckan/cli/seed.py
    A ckan/cli/server.py
    A ckan/cli/translation.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/install.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    R ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/gl/LC_MESSAGES/ckan.mo
    M ckan/i18n/gl/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mk/LC_MESSAGES/ckan.mo
    M ckan/i18n/mk/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jobs.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/query.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/migrate_package_activity.py
    A ckan/migration/revision_legacy_code.py
    R ckan/migration/versions/088_3ad397f70903_remove_migrate_version_table.py
    A ckan/migration/versions/088_delete_extras_which_are_deleted_state.py
    A ckan/migration/versions/089_package_activity_migration_check.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    A ckan/model/revision.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    M ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public-bs2/base/less/ckan.less
    A ckan/public/base/css/main-rtl.css
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/less/bootstrap-rtl.less
    A ckan/public/base/less/ckan-rtl.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/main-rtl.less
    M ckan/templates-bs2/base.html
    M ckan/templates-bs2/dataviewer/base.html
    R ckan/templates-bs2/development/markup.html
    R ckan/templates-bs2/development/snippets/markup.html
    M ckan/templates-bs2/group/about.html
    M ckan/templates-bs2/group/activity_stream.html
    M ckan/templates-bs2/group/admins.html
    M ckan/templates-bs2/group/followers.html
    R ckan/templates-bs2/group/history.html
    M ckan/templates-bs2/group/member_new.html
    M ckan/templates-bs2/group/members.html
    M ckan/templates-bs2/group/read_base.html
    M ckan/templates-bs2/group/snippets/group_item.html
    R ckan/templates-bs2/group/snippets/history_revisions.html
    R ckan/templates-bs2/group/snippets/revisions_table.html
    M ckan/templates-bs2/organization/about.html
    M ckan/templates-bs2/organization/activity_stream.html
    M ckan/templates-bs2/organization/admins.html
    M ckan/templates-bs2/organization/bulk_process.html
    M ckan/templates-bs2/organization/edit.html
    M ckan/templates-bs2/organization/edit_base.html
    M ckan/templates-bs2/organization/member_new.html
    M ckan/templates-bs2/organization/members.html
    M ckan/templates-bs2/organization/read_base.html
    M ckan/templates-bs2/package/activity.html
    M ckan/templates-bs2/package/base.html
    M ckan/templates-bs2/package/base_form_page.html
    M ckan/templates-bs2/package/edit_view.html
    M ckan/templates-bs2/package/followers.html
    R ckan/templates-bs2/package/history.html
    M ckan/templates-bs2/package/new_resource_not_draft.html
    M ckan/templates-bs2/package/new_view.html
    M ckan/templates-bs2/package/read.html
    M ckan/templates-bs2/package/read_base.html
    M ckan/templates-bs2/package/resource_edit.html
    M ckan/templates-bs2/package/resource_read.html
    M ckan/templates-bs2/package/resource_views.html
    M ckan/templates-bs2/package/resources.html
    R ckan/templates-bs2/package/snippets/history_revisions.html
    M ckan/templates-bs2/package/snippets/info.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resources.html
    M ckan/templates-bs2/package/snippets/resources_list.html
    R ckan/templates-bs2/package/snippets/revisions_table.html
    M ckan/templates-bs2/package/snippets/tags.html
    R ckan/templates-bs2/revision/diff.html
    R ckan/templates-bs2/revision/list.html
    R ckan/templates-bs2/revision/read.html
    R ckan/templates-bs2/revision/read_base.html
    R ckan/templates-bs2/revision/snippets/revisions_list.html
    A ckan/templates-bs2/snippets/activities/added_tag.html
    A ckan/templates-bs2/snippets/activities/changed_group.html
    A ckan/templates-bs2/snippets/activities/changed_organization.html
    A ckan/templates-bs2/snippets/activities/changed_package.html
    A ckan/templates-bs2/snippets/activities/changed_resource.html
    A ckan/templates-bs2/snippets/activities/changed_user.html
    A ckan/templates-bs2/snippets/activities/deleted_group.html
    A ckan/templates-bs2/snippets/activities/deleted_organization.html
    A ckan/templates-bs2/snippets/activities/deleted_package.html
    A ckan/templates-bs2/snippets/activities/deleted_resource.html
    A ckan/templates-bs2/snippets/activities/fallback.html
    A ckan/templates-bs2/snippets/activities/follow_dataset.html
    A ckan/templates-bs2/snippets/activities/follow_group.html
    A ckan/templates-bs2/snippets/activities/follow_user.html
    A ckan/templates-bs2/snippets/activities/new_group.html
    A ckan/templates-bs2/snippets/activities/new_organization.html
    A ckan/templates-bs2/snippets/activities/new_package.html
    A ckan/templates-bs2/snippets/activities/new_resource.html
    A ckan/templates-bs2/snippets/activities/new_user.html
    A ckan/templates-bs2/snippets/activities/removed_tag.html
    R ckan/templates-bs2/snippets/activity_item.html
    A ckan/templates-bs2/snippets/activity_stream.html
    M ckan/templates-bs2/snippets/organization.html
    M ckan/templates-bs2/snippets/tag_list.html
    M ckan/templates-bs2/user/activity_stream.html
    M ckan/templates-bs2/user/dashboard.html
    M ckan/templates-bs2/user/edit_base.html
    M ckan/templates-bs2/user/read_base.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/base.html
    R ckan/templates/development/markup.html
    R ckan/templates/development/snippets/markup.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    R ckan/templates/group/history.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    R ckan/templates/group/snippets/history_revisions.html
    R ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    A ckan/templates/package/changes.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/followers.html
    R ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/resources.html
    R ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/tags.html
    R ckan/templates/revision/diff.html
    R ckan/templates/revision/list.html
    R ckan/templates/revision/read.html
    R ckan/templates/revision/read_base.html
    R ckan/templates/revision/snippets/revisions_list.html
    A ckan/templates/snippets/activities/added_tag.html
    A ckan/templates/snippets/activities/changed_group.html
    A ckan/templates/snippets/activities/changed_organization.html
    A ckan/templates/snippets/activities/changed_package.html
    A ckan/templates/snippets/activities/changed_resource.html
    A ckan/templates/snippets/activities/changed_user.html
    A ckan/templates/snippets/activities/deleted_group.html
    A ckan/templates/snippets/activities/deleted_organization.html
    A ckan/templates/snippets/activities/deleted_package.html
    A ckan/templates/snippets/activities/deleted_resource.html
    A ckan/templates/snippets/activities/fallback.html
    A ckan/templates/snippets/activities/follow_dataset.html
    A ckan/templates/snippets/activities/follow_group.html
    A ckan/templates/snippets/activities/follow_user.html
    A ckan/templates/snippets/activities/new_group.html
    A ckan/templates/snippets/activities/new_organization.html
    A ckan/templates/snippets/activities/new_package.html
    A ckan/templates/snippets/activities/new_resource.html
    A ckan/templates/snippets/activities/new_user.html
    A ckan/templates/snippets/activities/removed_tag.html
    R ckan/templates/snippets/activity_item.html
    A ckan/templates/snippets/activity_stream.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    R ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    R ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    R ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    R ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    R ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    R ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/test_migrate_package_activity.py
    A ckan/tests/migration/test_revision_legacy_code.py
    M ckan/tests/model/licenses.v1
    M ckan/tests/model/licenses.v2
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/test_coding_standards.py
    M ckan/views/__init__.py
    M ckan/views/api.py
    M ckan/views/dashboard.py
    M ckan/views/dataset.py
    M ckan/views/group.py
    M ckan/views/home.py
    M ckan/views/resource.py
    M ckan/views/user.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/backend/postgres.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_chained_auth_functions.py
    R ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/datatablesview/controller.py
    M ckanext/datatablesview/plugin.py
    M ckanext/datatablesview/public/datatablesview.js
    M ckanext/datatablesview/templates/datatables/datatables_view.html
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/public/widget.recordcount.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/test_tag_vocab_plugin.py
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M contrib/docker/solr/solrconfig.xml
    M dev-requirements.txt
    M doc/conf.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/simple-code-contributions.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/extensions/tutorial.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-docker-compose.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/installing/solr.rst
    M doc/maintaining/paster.rst
    M doc/theming/index.rst
    M doc/theming/templates.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  conflict

  Commit: 6468d7c7d524059602ae49d5fee64293e53b9146
      https://github.com/ckan/ckan/commit/6468d7c7d524059602ae49d5fee64293e53b9146
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M ckan/cli/db.py
    A ckan/migration/versions/088_3537d5420e0e_delete_extrase_which_are_deleted_state.py
    R ckan/migration/versions/088_delete_extras_which_are_deleted_state.py
    A ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py
    R ckan/migration/versions/089_package_activity_migration_check.py
    A ckan/migration/versions/090_980dcd44de4b_delete_migrate_version_table.py
    M ckan/model/__init__.py

  Log Message:
  -----------
  Update PR with new migrations and Click CLI

  Commit: 2751c54788a6b76c54cdf54549473b12a4eb6778
      https://github.com/ckan/ckan/commit/2751c54788a6b76c54cdf54549473b12a4eb6778
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M ckan/cli/db.py
    M ckan/migration/__init__.py
    M ckan/migration/versions/088_3537d5420e0e_delete_extrase_which_are_deleted_state.py
    M ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py
    M ckan/migration/versions/090_980dcd44de4b_delete_migrate_version_table.py

  Log Message:
  -----------
  string literals

  Commit: b68a836a416127bb119722d0a75b296d865fd32b
      https://github.com/ckan/ckan/commit/b68a836a416127bb119722d0a75b296d865fd32b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M ckan/model/tag.py
    R ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_package.py
    A ckan/tests/model/test_package.py
    A ckan/tests/model/test_package_extra.py
    A ckan/tests/model/test_tags.py

  Log Message:
  -----------
  Modernize package model tests

* The rest of ckan/tests/legacy/models/test_package.py will go with the
revisioning.
* tag.by_name() is deprecated because it doesnt seem used anywhere and
is broken - missing a join in the query, so the Tag.name filter does
nothing.
* tag.search_by_name() is deprecated because it isn't used in core ckan.
I think some sites will have a tag search, but they should really have
the code in their own repo, so we're giving them warning.

  Commit: 97093dc87e84fa6e3b2b528251ea03ce32376393
      https://github.com/ckan/ckan/commit/97093dc87e84fa6e3b2b528251ea03ce32376393
  Author: amercader <amercadero at gmail.com>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#4779] Remove Boostrap 2 templates option

Leave the config option and mechanism to switch templates in place in
case we re-use in the future, but only accepting the current values.

  Commit: c136ed1400c3445fdffe0d2474970fa68297e230
      https://github.com/ckan/ckan/commit/c136ed1400c3445fdffe0d2474970fa68297e230
  Author: amercader <amercadero at gmail.com>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    R ckan/public-bs2/base/css/.gitignore
    R ckan/public-bs2/base/css/fuchsia.css
    R ckan/public-bs2/base/css/green.css
    R ckan/public-bs2/base/css/main.css
    R ckan/public-bs2/base/css/maroon.css
    R ckan/public-bs2/base/css/red.css
    R ckan/public-bs2/base/i18n/.gitignore
    R ckan/public-bs2/base/images/background-tag-ie7.png
    R ckan/public-bs2/base/images/background-tag.png
    R ckan/public-bs2/base/images/background-tile.png
    R ckan/public-bs2/base/images/bg.png
    R ckan/public-bs2/base/images/breadcrumb-slash-ie7.png
    R ckan/public-bs2/base/images/ckan-logo-footer.png
    R ckan/public-bs2/base/images/ckan-logo-white.svg
    R ckan/public-bs2/base/images/ckan-logo.png
    R ckan/public-bs2/base/images/ckan-logo.svg
    R ckan/public-bs2/base/images/ckan.ico
    R ckan/public-bs2/base/images/dashboard-followee-related.png
    R ckan/public-bs2/base/images/dotted.png
    R ckan/public-bs2/base/images/editing.png
    R ckan/public-bs2/base/images/full-width-nav-right.png
    R ckan/public-bs2/base/images/icon-search-27x26.png
    R ckan/public-bs2/base/images/loading-spinner.gif
    R ckan/public-bs2/base/images/nav-active.png
    R ckan/public-bs2/base/images/nav.png
    R ckan/public-bs2/base/images/od_80x15_blue.png
    R ckan/public-bs2/base/images/placeholder-200x125.png
    R ckan/public-bs2/base/images/placeholder-420x220.png
    R ckan/public-bs2/base/images/placeholder-680x400.png
    R ckan/public-bs2/base/images/placeholder-application.png
    R ckan/public-bs2/base/images/placeholder-group.png
    R ckan/public-bs2/base/images/placeholder-image.png
    R ckan/public-bs2/base/images/placeholder-organization.png
    R ckan/public-bs2/base/images/sprite-ckan-icons.png
    R ckan/public-bs2/base/images/sprite-resource-icons.png
    R ckan/public-bs2/base/images/table-seperator.png
    R ckan/public-bs2/base/javascript/client.js
    R ckan/public-bs2/base/javascript/i18n.js
    R ckan/public-bs2/base/javascript/main.js
    R ckan/public-bs2/base/javascript/module.js
    R ckan/public-bs2/base/javascript/modules/activity-stream.js
    R ckan/public-bs2/base/javascript/modules/api-info.js
    R ckan/public-bs2/base/javascript/modules/autocomplete.js
    R ckan/public-bs2/base/javascript/modules/basic-form.js
    R ckan/public-bs2/base/javascript/modules/confirm-action.js
    R ckan/public-bs2/base/javascript/modules/custom-fields.js
    R ckan/public-bs2/base/javascript/modules/dashboard.js
    R ckan/public-bs2/base/javascript/modules/data-viewer.js
    R ckan/public-bs2/base/javascript/modules/dataset-visibility.js
    R ckan/public-bs2/base/javascript/modules/follow.js
    R ckan/public-bs2/base/javascript/modules/followers-counter.js
    R ckan/public-bs2/base/javascript/modules/image-upload.js
    R ckan/public-bs2/base/javascript/modules/media-grid.js
    R ckan/public-bs2/base/javascript/modules/popover-context.js
    R ckan/public-bs2/base/javascript/modules/resource-form.js
    R ckan/public-bs2/base/javascript/modules/resource-reorder.js
    R ckan/public-bs2/base/javascript/modules/resource-upload-field.js
    R ckan/public-bs2/base/javascript/modules/resource-view-embed.js
    R ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    R ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    R ckan/public-bs2/base/javascript/modules/resource-view-reorder.js
    R ckan/public-bs2/base/javascript/modules/select-switch.js
    R ckan/public-bs2/base/javascript/modules/slug-preview.js
    R ckan/public-bs2/base/javascript/modules/table-selectable-rows.js
    R ckan/public-bs2/base/javascript/modules/table-toggle-more.js
    R ckan/public-bs2/base/javascript/notify.js
    R ckan/public-bs2/base/javascript/plugins/jquery.date-helpers.js
    R ckan/public-bs2/base/javascript/plugins/jquery.form-warning.js
    R ckan/public-bs2/base/javascript/plugins/jquery.images-loaded.js
    R ckan/public-bs2/base/javascript/plugins/jquery.inherit.js
    R ckan/public-bs2/base/javascript/plugins/jquery.masonry.js
    R ckan/public-bs2/base/javascript/plugins/jquery.proxy-all.js
    R ckan/public-bs2/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public-bs2/base/javascript/plugins/jquery.slug.js
    R ckan/public-bs2/base/javascript/plugins/jquery.truncator.js
    R ckan/public-bs2/base/javascript/plugins/jquery.url-helpers.js
    R ckan/public-bs2/base/javascript/pubsub.js
    R ckan/public-bs2/base/javascript/resource.config
    R ckan/public-bs2/base/javascript/sandbox.js
    R ckan/public-bs2/base/javascript/tracking.js
    R ckan/public-bs2/base/javascript/view-filters.js
    R ckan/public-bs2/base/less/activity.less
    R ckan/public-bs2/base/less/ckan.less
    R ckan/public-bs2/base/less/custom.less
    R ckan/public-bs2/base/less/dashboard.less
    R ckan/public-bs2/base/less/datapusher.less
    R ckan/public-bs2/base/less/dataset.less
    R ckan/public-bs2/base/less/dropdown.less
    R ckan/public-bs2/base/less/footer.less
    R ckan/public-bs2/base/less/forms.less
    R ckan/public-bs2/base/less/group.less
    R ckan/public-bs2/base/less/homepage.less
    R ckan/public-bs2/base/less/icons.less
    R ckan/public-bs2/base/less/iehacks.less
    R ckan/public-bs2/base/less/layout.less
    R ckan/public-bs2/base/less/main.less
    R ckan/public-bs2/base/less/masthead.less
    R ckan/public-bs2/base/less/media.less
    R ckan/public-bs2/base/less/mixins.less
    R ckan/public-bs2/base/less/module.less
    R ckan/public-bs2/base/less/nav.less
    R ckan/public-bs2/base/less/profile.less
    R ckan/public-bs2/base/less/prose.less
    R ckan/public-bs2/base/less/resource-view.less
    R ckan/public-bs2/base/less/search.less
    R ckan/public-bs2/base/less/tables.less
    R ckan/public-bs2/base/less/toolbar.less
    R ckan/public-bs2/base/less/variables.less
    R ckan/public-bs2/base/test/index.html
    R ckan/public-bs2/base/test/primer/index.html
    R ckan/public-bs2/base/test/spec/ckan.spec.js
    R ckan/public-bs2/base/test/spec/client.spec.js
    R ckan/public-bs2/base/test/spec/i18n.spec.js
    R ckan/public-bs2/base/test/spec/module.spec.js
    R ckan/public-bs2/base/test/spec/modules/autocomplete.spec.js
    R ckan/public-bs2/base/test/spec/modules/basic-form.spec.js
    R ckan/public-bs2/base/test/spec/modules/confirm-action.spec.js
    R ckan/public-bs2/base/test/spec/modules/custom-fields.spec.js
    R ckan/public-bs2/base/test/spec/modules/followers-counter.spec.js
    R ckan/public-bs2/base/test/spec/modules/image-upload.spec.js
    R ckan/public-bs2/base/test/spec/modules/resource-form.spec.js
    R ckan/public-bs2/base/test/spec/modules/resource-upload-field.spec.js
    R ckan/public-bs2/base/test/spec/notify.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.date-helpers.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.form-warning.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.inherit.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.proxy-all.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.js
    R ckan/public-bs2/base/test/spec/pubsub.spec.js
    R ckan/public-bs2/base/test/spec/sandbox.spec.js
    R ckan/public-bs2/base/test/spec/view-filters.spec.js
    R ckan/public-bs2/base/test/vendor/chai.js
    R ckan/public-bs2/base/test/vendor/less.js
    R ckan/public-bs2/base/test/vendor/mocha.css
    R ckan/public-bs2/base/test/vendor/mocha.js
    R ckan/public-bs2/base/test/vendor/sinon.js
    R ckan/public-bs2/base/vendor/bootstrap.js
    R ckan/public-bs2/base/vendor/bootstrap.min.js
    R ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.js
    R ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.min.js
    R ckan/public-bs2/base/vendor/bootstrap/less/accordion.less
    R ckan/public-bs2/base/vendor/bootstrap/less/alerts.less
    R ckan/public-bs2/base/vendor/bootstrap/less/bootstrap.less
    R ckan/public-bs2/base/vendor/bootstrap/less/breadcrumbs.less
    R ckan/public-bs2/base/vendor/bootstrap/less/button-groups.less
    R ckan/public-bs2/base/vendor/bootstrap/less/buttons.less
    R ckan/public-bs2/base/vendor/bootstrap/less/carousel.less
    R ckan/public-bs2/base/vendor/bootstrap/less/close.less
    R ckan/public-bs2/base/vendor/bootstrap/less/code.less
    R ckan/public-bs2/base/vendor/bootstrap/less/component-animations.less
    R ckan/public-bs2/base/vendor/bootstrap/less/dropdowns.less
    R ckan/public-bs2/base/vendor/bootstrap/less/forms.less
    R ckan/public-bs2/base/vendor/bootstrap/less/grid.less
    R ckan/public-bs2/base/vendor/bootstrap/less/hero-unit.less
    R ckan/public-bs2/base/vendor/bootstrap/less/labels-badges.less
    R ckan/public-bs2/base/vendor/bootstrap/less/layouts.less
    R ckan/public-bs2/base/vendor/bootstrap/less/media.less
    R ckan/public-bs2/base/vendor/bootstrap/less/mixins.less
    R ckan/public-bs2/base/vendor/bootstrap/less/modals.less
    R ckan/public-bs2/base/vendor/bootstrap/less/navbar.less
    R ckan/public-bs2/base/vendor/bootstrap/less/navs.less
    R ckan/public-bs2/base/vendor/bootstrap/less/pager.less
    R ckan/public-bs2/base/vendor/bootstrap/less/pagination.less
    R ckan/public-bs2/base/vendor/bootstrap/less/popovers.less
    R ckan/public-bs2/base/vendor/bootstrap/less/progress-bars.less
    R ckan/public-bs2/base/vendor/bootstrap/less/reset.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-1200px-min.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-767px-max.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-768px-979px.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-navbar.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-utilities.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive.less
    R ckan/public-bs2/base/vendor/bootstrap/less/scaffolding.less
    R ckan/public-bs2/base/vendor/bootstrap/less/sprites.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tables.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/buttons.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.css
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/forms-responsive.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/forms.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-static-top.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public-bs2/base/vendor/bootstrap/less/thumbnails.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tooltip.less
    R ckan/public-bs2/base/vendor/bootstrap/less/type.less
    R ckan/public-bs2/base/vendor/bootstrap/less/utilities.less
    R ckan/public-bs2/base/vendor/bootstrap/less/variables.less
    R ckan/public-bs2/base/vendor/bootstrap/less/wells.less
    R ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.css
    R ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public-bs2/base/vendor/font-awesome/fonts/FontAwesome.otf
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public-bs2/base/vendor/font-awesome/less/bordered-pulled.less
    R ckan/public-bs2/base/vendor/font-awesome/less/core.less
    R ckan/public-bs2/base/vendor/font-awesome/less/extras.less
    R ckan/public-bs2/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public-bs2/base/vendor/font-awesome/less/font-awesome.less
    R ckan/public-bs2/base/vendor/font-awesome/less/icons.less
    R ckan/public-bs2/base/vendor/font-awesome/less/larger.less
    R ckan/public-bs2/base/vendor/font-awesome/less/list.less
    R ckan/public-bs2/base/vendor/font-awesome/less/mixins.less
    R ckan/public-bs2/base/vendor/font-awesome/less/path.less
    R ckan/public-bs2/base/vendor/font-awesome/less/rotated-flipped.less
    R ckan/public-bs2/base/vendor/font-awesome/less/spinning.less
    R ckan/public-bs2/base/vendor/font-awesome/less/stacked.less
    R ckan/public-bs2/base/vendor/font-awesome/less/variables.less
    R ckan/public-bs2/base/vendor/html5.js
    R ckan/public-bs2/base/vendor/html5.min.js
    R ckan/public-bs2/base/vendor/jed.js
    R ckan/public-bs2/base/vendor/jed.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    R ckan/public-bs2/base/vendor/jquery.js
    R ckan/public-bs2/base/vendor/jquery.min.js
    R ckan/public-bs2/base/vendor/jquery.ui.core.js
    R ckan/public-bs2/base/vendor/jquery.ui.mouse.js
    R ckan/public-bs2/base/vendor/jquery.ui.sortable.js
    R ckan/public-bs2/base/vendor/jquery.ui.widget.js
    R ckan/public-bs2/base/vendor/moment-with-locales.js
    R ckan/public-bs2/base/vendor/polyfill-object-keys.js
    R ckan/public-bs2/base/vendor/resource.config
    R ckan/public-bs2/base/vendor/select2/.gitignore
    R ckan/public-bs2/base/vendor/select2/CONTRIBUTING.md
    R ckan/public-bs2/base/vendor/select2/LICENSE
    R ckan/public-bs2/base/vendor/select2/README.md
    R ckan/public-bs2/base/vendor/select2/bower.json
    R ckan/public-bs2/base/vendor/select2/component.json
    R ckan/public-bs2/base/vendor/select2/composer.json
    R ckan/public-bs2/base/vendor/select2/package.json
    R ckan/public-bs2/base/vendor/select2/release.sh
    R ckan/public-bs2/base/vendor/select2/select2-bootstrap.css
    R ckan/public-bs2/base/vendor/select2/select2-spinner.gif
    R ckan/public-bs2/base/vendor/select2/select2.css
    R ckan/public-bs2/base/vendor/select2/select2.jquery.json
    R ckan/public-bs2/base/vendor/select2/select2.js
    R ckan/public-bs2/base/vendor/select2/select2.min.js
    R ckan/public-bs2/base/vendor/select2/select2.png
    R ckan/public-bs2/base/vendor/select2/select2_locale_ar.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_az.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_bg.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ca.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_cs.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_da.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_de.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_el.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_en.js.template
    R ckan/public-bs2/base/vendor/select2/select2_locale_es.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_et.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_eu.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fa.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fi.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_gl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_he.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_hr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_hu.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_id.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_is.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_it.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ja.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ka.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ko.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_lt.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_lv.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_mk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ms.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_nb.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_nl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pt-BR.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pt-PT.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ro.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_rs.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ru.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_sk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_sv.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_th.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_tr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ug-CN.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_uk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_vi.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_zh-CN.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_zh-TW.js
    R ckan/public-bs2/base/vendor/select2/select2x2.png
    R ckan/templates-bs2/activity_streams/activity_stream_email_notifications.text
    R ckan/templates-bs2/activity_streams/activity_stream_items.html
    R ckan/templates-bs2/admin/base.html
    R ckan/templates-bs2/admin/config.html
    R ckan/templates-bs2/admin/confirm_reset.html
    R ckan/templates-bs2/admin/index.html
    R ckan/templates-bs2/admin/trash.html
    R ckan/templates-bs2/ajax_snippets/custom_fields.html
    R ckan/templates-bs2/ajax_snippets/follow_button.html
    R ckan/templates-bs2/base.html
    R ckan/templates-bs2/dataviewer/base.html
    R ckan/templates-bs2/dataviewer/snippets/data_preview.html
    R ckan/templates-bs2/dataviewer/snippets/no_preview.html
    R ckan/templates-bs2/development/primer.html
    R ckan/templates-bs2/development/snippets/actions.html
    R ckan/templates-bs2/development/snippets/breadcrumb.html
    R ckan/templates-bs2/development/snippets/context.html
    R ckan/templates-bs2/development/snippets/facet.html
    R ckan/templates-bs2/development/snippets/form.html
    R ckan/templates-bs2/development/snippets/form_stages.html
    R ckan/templates-bs2/development/snippets/list.html
    R ckan/templates-bs2/development/snippets/media_grid.html
    R ckan/templates-bs2/development/snippets/module.html
    R ckan/templates-bs2/development/snippets/nav.html
    R ckan/templates-bs2/development/snippets/page_header.html
    R ckan/templates-bs2/development/snippets/pagination.html
    R ckan/templates-bs2/development/snippets/simple-input.html
    R ckan/templates-bs2/emails/invite_user.txt
    R ckan/templates-bs2/emails/invite_user_subject.txt
    R ckan/templates-bs2/emails/reset_password.txt
    R ckan/templates-bs2/emails/reset_password_subject.txt
    R ckan/templates-bs2/error_document_template.html
    R ckan/templates-bs2/footer.html
    R ckan/templates-bs2/group/about.html
    R ckan/templates-bs2/group/activity_stream.html
    R ckan/templates-bs2/group/admins.html
    R ckan/templates-bs2/group/base_form_page.html
    R ckan/templates-bs2/group/confirm_delete.html
    R ckan/templates-bs2/group/confirm_delete_member.html
    R ckan/templates-bs2/group/edit.html
    R ckan/templates-bs2/group/edit_base.html
    R ckan/templates-bs2/group/followers.html
    R ckan/templates-bs2/group/index.html
    R ckan/templates-bs2/group/member_new.html
    R ckan/templates-bs2/group/members.html
    R ckan/templates-bs2/group/new.html
    R ckan/templates-bs2/group/new_group_form.html
    R ckan/templates-bs2/group/read.html
    R ckan/templates-bs2/group/read_base.html
    R ckan/templates-bs2/group/snippets/feeds.html
    R ckan/templates-bs2/group/snippets/group_form.html
    R ckan/templates-bs2/group/snippets/group_item.html
    R ckan/templates-bs2/group/snippets/group_list.html
    R ckan/templates-bs2/group/snippets/helper.html
    R ckan/templates-bs2/group/snippets/info.html
    R ckan/templates-bs2/header.html
    R ckan/templates-bs2/home/about.html
    R ckan/templates-bs2/home/index.html
    R ckan/templates-bs2/home/layout1.html
    R ckan/templates-bs2/home/layout2.html
    R ckan/templates-bs2/home/layout3.html
    R ckan/templates-bs2/home/snippets/about_text.html
    R ckan/templates-bs2/home/snippets/featured_group.html
    R ckan/templates-bs2/home/snippets/featured_organization.html
    R ckan/templates-bs2/home/snippets/promoted.html
    R ckan/templates-bs2/home/snippets/search.html
    R ckan/templates-bs2/home/snippets/stats.html
    R ckan/templates-bs2/macros/autoform.html
    R ckan/templates-bs2/macros/form.html
    R ckan/templates-bs2/organization/about.html
    R ckan/templates-bs2/organization/activity_stream.html
    R ckan/templates-bs2/organization/admins.html
    R ckan/templates-bs2/organization/base_form_page.html
    R ckan/templates-bs2/organization/bulk_process.html
    R ckan/templates-bs2/organization/confirm_delete.html
    R ckan/templates-bs2/organization/confirm_delete_member.html
    R ckan/templates-bs2/organization/edit.html
    R ckan/templates-bs2/organization/edit_base.html
    R ckan/templates-bs2/organization/index.html
    R ckan/templates-bs2/organization/member_new.html
    R ckan/templates-bs2/organization/members.html
    R ckan/templates-bs2/organization/new.html
    R ckan/templates-bs2/organization/new_organization_form.html
    R ckan/templates-bs2/organization/read.html
    R ckan/templates-bs2/organization/read_base.html
    R ckan/templates-bs2/organization/snippets/feeds.html
    R ckan/templates-bs2/organization/snippets/help.html
    R ckan/templates-bs2/organization/snippets/helper.html
    R ckan/templates-bs2/organization/snippets/info.html
    R ckan/templates-bs2/organization/snippets/organization_form.html
    R ckan/templates-bs2/organization/snippets/organization_item.html
    R ckan/templates-bs2/organization/snippets/organization_list.html
    R ckan/templates-bs2/package/activity.html
    R ckan/templates-bs2/package/base.html
    R ckan/templates-bs2/package/base_form_page.html
    R ckan/templates-bs2/package/confirm_delete.html
    R ckan/templates-bs2/package/confirm_delete_resource.html
    R ckan/templates-bs2/package/edit.html
    R ckan/templates-bs2/package/edit_base.html
    R ckan/templates-bs2/package/edit_view.html
    R ckan/templates-bs2/package/followers.html
    R ckan/templates-bs2/package/group_list.html
    R ckan/templates-bs2/package/new.html
    R ckan/templates-bs2/package/new_package_form.html
    R ckan/templates-bs2/package/new_resource.html
    R ckan/templates-bs2/package/new_resource_not_draft.html
    R ckan/templates-bs2/package/new_view.html
    R ckan/templates-bs2/package/read.html
    R ckan/templates-bs2/package/read_base.html
    R ckan/templates-bs2/package/resource_edit.html
    R ckan/templates-bs2/package/resource_edit_base.html
    R ckan/templates-bs2/package/resource_read.html
    R ckan/templates-bs2/package/resource_views.html
    R ckan/templates-bs2/package/resources.html
    R ckan/templates-bs2/package/search.html
    R ckan/templates-bs2/package/snippets/additional_info.html
    R ckan/templates-bs2/package/snippets/cannot_create_package.html
    R ckan/templates-bs2/package/snippets/info.html
    R ckan/templates-bs2/package/snippets/new_package_breadcrumb.html
    R ckan/templates-bs2/package/snippets/package_basic_fields.html
    R ckan/templates-bs2/package/snippets/package_form.html
    R ckan/templates-bs2/package/snippets/package_metadata_fields.html
    R ckan/templates-bs2/package/snippets/resource_edit_form.html
    R ckan/templates-bs2/package/snippets/resource_form.html
    R ckan/templates-bs2/package/snippets/resource_help.html
    R ckan/templates-bs2/package/snippets/resource_info.html
    R ckan/templates-bs2/package/snippets/resource_item.html
    R ckan/templates-bs2/package/snippets/resource_view.html
    R ckan/templates-bs2/package/snippets/resource_view_embed.html
    R ckan/templates-bs2/package/snippets/resource_view_filters.html
    R ckan/templates-bs2/package/snippets/resource_views_list.html
    R ckan/templates-bs2/package/snippets/resource_views_list_item.html
    R ckan/templates-bs2/package/snippets/resources.html
    R ckan/templates-bs2/package/snippets/resources_list.html
    R ckan/templates-bs2/package/snippets/stages.html
    R ckan/templates-bs2/package/snippets/tags.html
    R ckan/templates-bs2/package/snippets/view_form.html
    R ckan/templates-bs2/package/snippets/view_form_filters.html
    R ckan/templates-bs2/package/snippets/view_help.html
    R ckan/templates-bs2/package/view_edit_base.html
    R ckan/templates-bs2/page.html
    R ckan/templates-bs2/revision/__init__.py
    R ckan/templates-bs2/robots.txt
    R ckan/templates-bs2/snippets/activities/added_tag.html
    R ckan/templates-bs2/snippets/activities/changed_group.html
    R ckan/templates-bs2/snippets/activities/changed_organization.html
    R ckan/templates-bs2/snippets/activities/changed_package.html
    R ckan/templates-bs2/snippets/activities/changed_resource.html
    R ckan/templates-bs2/snippets/activities/changed_user.html
    R ckan/templates-bs2/snippets/activities/deleted_group.html
    R ckan/templates-bs2/snippets/activities/deleted_organization.html
    R ckan/templates-bs2/snippets/activities/deleted_package.html
    R ckan/templates-bs2/snippets/activities/deleted_resource.html
    R ckan/templates-bs2/snippets/activities/fallback.html
    R ckan/templates-bs2/snippets/activities/follow_dataset.html
    R ckan/templates-bs2/snippets/activities/follow_group.html
    R ckan/templates-bs2/snippets/activities/follow_user.html
    R ckan/templates-bs2/snippets/activities/new_group.html
    R ckan/templates-bs2/snippets/activities/new_organization.html
    R ckan/templates-bs2/snippets/activities/new_package.html
    R ckan/templates-bs2/snippets/activities/new_resource.html
    R ckan/templates-bs2/snippets/activities/new_user.html
    R ckan/templates-bs2/snippets/activities/removed_tag.html
    R ckan/templates-bs2/snippets/activity_stream.html
    R ckan/templates-bs2/snippets/additional_info.html
    R ckan/templates-bs2/snippets/context.html
    R ckan/templates-bs2/snippets/context/dataset.html
    R ckan/templates-bs2/snippets/context/group.html
    R ckan/templates-bs2/snippets/context/user.html
    R ckan/templates-bs2/snippets/custom_form_fields.html
    R ckan/templates-bs2/snippets/datapreview_embed_dialog.html
    R ckan/templates-bs2/snippets/datapusher_status.html
    R ckan/templates-bs2/snippets/debug.html
    R ckan/templates-bs2/snippets/disqus_trackback.html
    R ckan/templates-bs2/snippets/facet_list.html
    R ckan/templates-bs2/snippets/follow_button.html
    R ckan/templates-bs2/snippets/group.html
    R ckan/templates-bs2/snippets/group_item.html
    R ckan/templates-bs2/snippets/home_breadcrumb_item.html
    R ckan/templates-bs2/snippets/language_selector.html
    R ckan/templates-bs2/snippets/license.html
    R ckan/templates-bs2/snippets/local_friendly_datetime.html
    R ckan/templates-bs2/snippets/organization.html
    R ckan/templates-bs2/snippets/organization_item.html
    R ckan/templates-bs2/snippets/package_grid.html
    R ckan/templates-bs2/snippets/package_item.html
    R ckan/templates-bs2/snippets/package_list.html
    R ckan/templates-bs2/snippets/popular.html
    R ckan/templates-bs2/snippets/private.html
    R ckan/templates-bs2/snippets/search_form.html
    R ckan/templates-bs2/snippets/search_result_text.html
    R ckan/templates-bs2/snippets/simple_search.html
    R ckan/templates-bs2/snippets/social.html
    R ckan/templates-bs2/snippets/sort_by.html
    R ckan/templates-bs2/snippets/subscribe.html
    R ckan/templates-bs2/snippets/tag_list.html
    R ckan/templates-bs2/tag/index.html
    R ckan/templates-bs2/tests/broken_helper_as_attribute.html
    R ckan/templates-bs2/tests/broken_helper_as_item.html
    R ckan/templates-bs2/tests/flash_messages.html
    R ckan/templates-bs2/tests/helper_as_attribute.html
    R ckan/templates-bs2/tests/helper_as_item.html
    R ckan/templates-bs2/tests/mock_json_resource_preview_template.html
    R ckan/templates-bs2/tests/mock_resource_preview_template.html
    R ckan/templates-bs2/user/activity_stream.html
    R ckan/templates-bs2/user/dashboard.html
    R ckan/templates-bs2/user/dashboard_datasets.html
    R ckan/templates-bs2/user/dashboard_groups.html
    R ckan/templates-bs2/user/dashboard_organizations.html
    R ckan/templates-bs2/user/edit.html
    R ckan/templates-bs2/user/edit_base.html
    R ckan/templates-bs2/user/edit_user_form.html
    R ckan/templates-bs2/user/followers.html
    R ckan/templates-bs2/user/list.html
    R ckan/templates-bs2/user/login.html
    R ckan/templates-bs2/user/logout.html
    R ckan/templates-bs2/user/logout_first.html
    R ckan/templates-bs2/user/new.html
    R ckan/templates-bs2/user/new_user_form.html
    R ckan/templates-bs2/user/perform_reset.html
    R ckan/templates-bs2/user/read.html
    R ckan/templates-bs2/user/read_base.html
    R ckan/templates-bs2/user/request_reset.html
    R ckan/templates-bs2/user/snippets/followee_dropdown.html
    R ckan/templates-bs2/user/snippets/followers.html
    R ckan/templates-bs2/user/snippets/login_form.html
    R ckan/templates-bs2/user/snippets/recaptcha.html
    R ckan/templates-bs2/user/snippets/user_search.html

  Log Message:
  -----------
  [#4779] [#4779] Remove Bootstrap 2 templates

  Commit: 18101be74298500195460aaa13cb969db5fca6d2
      https://github.com/ckan/ckan/commit/18101be74298500195460aaa13cb969db5fca6d2
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M ckan/cli/db.py

  Log Message:
  -----------
  Update ckan/cli/db.py

Co-Authored-By: David Read <david.read at hackneyworkshop.com>

  Commit: e8d430c0a5ee7a0f1ec06a0ba9d09cdfa68e9969
      https://github.com/ckan/ckan/commit/e8d430c0a5ee7a0f1ec06a0ba9d09cdfa68e9969
  Author: Ian Ward <ian at excess.org>
  Date:   2019-05-11 (Sat, 11 May 2019)

  Changed paths:
    M .gitignore
    M ckan/cli/db.py
    M ckan/lib/cli.py
    M ckan/migration/README
    M ckan/migration/__init__.py
    A ckan/migration/alembic.ini
    A ckan/migration/env.py
    R ckan/migration/manage.py
    R ckan/migration/migrate.cfg
    A ckan/migration/script.py.mako
    A ckan/migration/versions/001_103676e0a497_create_existing_tables.py
    R ckan/migration/versions/001_add_existing_tables.py
    A ckan/migration/versions/002_86fdd8c54775_add_author_and_maintainer.py
    R ckan/migration/versions/002_add_author_and_maintainer.py
    R ckan/migration/versions/003_add_user_object.py
    A ckan/migration/versions/003_f22b4f5241a5_add_user_object.py
    R ckan/migration/versions/004_add_group_object.py
    A ckan/migration/versions/004_f92ee205e46d_add_group_object.py
    A ckan/migration/versions/005_12c2232c15f5_add_authorization_tables.py
    R ckan/migration/versions/005_add_authorization_tables.py
    R ckan/migration/versions/006_add_ratings.py
    A ckan/migration/versions/006_c83955e7acb6_add_ratings.py
    A ckan/migration/versions/007_1928d4af1cda_add_system_roles.py
    R ckan/migration/versions/007_add_system_roles.py
    A ckan/migration/versions/008_e8283ffb257e_update_vdm_ids.py
    R ckan/migration/versions/008_update_vdm_ids.py
    R ckan/migration/versions/009_add_creation_timestamps.py
    A ckan/migration/versions/009_b739a48de5c4_add_creation_timestamps.py
    A ckan/migration/versions/010_a6f13bf14d0c_add_user_about.py
    R ckan/migration/versions/010_add_user_about.py
    A ckan/migration/versions/011_866f6370b4ac_add_package_search_vector.py
    R ckan/migration/versions/011_add_package_search_vector.py
    R ckan/migration/versions/012_add_resources.py
    A ckan/migration/versions/012_e5ca33a5d445_add_resources.py
    A ckan/migration/versions/013_8a3a5af39797_add_hash.py
    R ckan/migration/versions/013_add_hash.py
    A ckan/migration/versions/014_93519b684820_hash_2.py
    R ckan/migration/versions/014_hash_2.py
    A ckan/migration/versions/015_6d8ffebcaf54_remove_state_object.py
    R ckan/migration/versions/015_remove_state_object.py
    A ckan/migration/versions/016_37ada738328e_uuids_everywhere.py
    R ckan/migration/versions/016_uuids_everywhere.py
    A ckan/migration/versions/017_1250b2ff3e36_add_pkg_relationships.py
    R ckan/migration/versions/017_add_pkg_relationships.py
    A ckan/migration/versions/018_05a0778051ca_adjust_licenses.py
    R ckan/migration/versions/018_adjust_licenses.py
    A ckan/migration/versions/019_b2eb6f34a638_pkg_relationships_state.py
    R ckan/migration/versions/019_pkg_relationships_state.py
    A ckan/migration/versions/020_69a0b0efc609_add_changeset.py
    R ckan/migration/versions/020_add_changeset.py
    A ckan/migration/versions/021_765143af2ba3_postgresql_upgrade_sql.py
    R ckan/migration/versions/021_postgres_downgrade.sql
    R ckan/migration/versions/021_postgres_upgrade.sql
    R ckan/migration/versions/021_postgresql_downgrade.sql
    R ckan/migration/versions/021_postgresql_upgrade.sql
    A ckan/migration/versions/022_7b324ca6c0dc_add_group_extras.py
    R ckan/migration/versions/022_add_group_extras.py
    A ckan/migration/versions/023_87fdd05f0744_add_harvesting.py
    R ckan/migration/versions/023_add_harvesting.py
    A ckan/migration/versions/024_12981fe12484_add_harvested_document.py
    R ckan/migration/versions/024_add_harvested_document.py
    R ckan/migration/versions/025_add_authorization_groups.py
    A ckan/migration/versions/025_b581622ad327_add_authorization_groups.py
    A ckan/migration/versions/026_3615b25af443_authorization_group_user_pk.py
    R ckan/migration/versions/026_authorization_group_user_pk.py
    A ckan/migration/versions/027_11e5745c6fc9_adjust_harvester.py
    R ckan/migration/versions/027_adjust_harvester.py
    A ckan/migration/versions/028_cdd68fe9ba21_drop_harvest_source_status.py
    R ckan/migration/versions/028_drop_harvest_source_status.py
    A ckan/migration/versions/029_1bfdf4240915_version_groups.py
    R ckan/migration/versions/029_version_groups.py
    R ckan/migration/versions/030_additional_user_attributes.py
    A ckan/migration/versions/030_b16cbf164c8a_additional_user_attributes.py
    A ckan/migration/versions/031_1b05245167d6_move_openid_to_new_field.py
    R ckan/migration/versions/031_move_openid_to_new_field.py
    R ckan/migration/versions/032_add_extra_info_field_to_resources.py
    A ckan/migration/versions/032_d89e0731422d_add_extra_info_field_to_resources.py
    A ckan/migration/versions/033_6da92ef2df15_auth_group_user_id_add_conditional.py
    R ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    A ckan/migration/versions/034_6c600693af5b_resource_group_table.py
    R ckan/migration/versions/034_resource_group_table.py
    A ckan/migration/versions/035_81148ccebd6c_harvesting_doc_versioning.py
    R ckan/migration/versions/035_harvesting_doc_versioning.py
    A ckan/migration/versions/036_ecaa8b38782f_lockdown_roles.py
    R ckan/migration/versions/036_lockdown_roles.py
    A ckan/migration/versions/037_edcf3b8c3c1b_role_anon_editor.py
    R ckan/migration/versions/037_role_anon_editor.py
    R ckan/migration/versions/038_delete_migration_tables.py
    A ckan/migration/versions/038_fd6622e3d964_delete_migration_tables.py
    R ckan/migration/versions/039_add_expired_id_and_dates.py
    A ckan/migration/versions/039_cca459c76d45_add_expired_id_and_dates.py
    A ckan/migration/versions/040_500a08f4818e_reset_key_on_user.py
    R ckan/migration/versions/040_reset_key_on_user.py
    A ckan/migration/versions/041_6817d4e3bdc3_resource_new_fields.py
    R ckan/migration/versions/041_resource_new_fields.py
    A ckan/migration/versions/042_da65e2877034_user_revision_indexes.py
    R ckan/migration/versions/042_user_revision_indexes.py
    A ckan/migration/versions/043_bd38cd6502b2_drop_postgres_search.py
    R ckan/migration/versions/043_drop_postgres_search.py
    A ckan/migration/versions/044_4190eeeb8d73_add_task_status.py
    R ckan/migration/versions/044_add_task_status.py
    A ckan/migration/versions/045_54e3f155d945_user_name_unique.py
    R ckan/migration/versions/045_user_name_unique.py
    A ckan/migration/versions/046_b69e9b80396f_drop_changesets.py
    R ckan/migration/versions/046_drop_changesets.py
    A ckan/migration/versions/047_883a7c406926_rename_package_group_member.py
    R ckan/migration/versions/047_rename_package_group_member.py
    A ckan/migration/versions/048_4a7011172b3f_add_activity_streams_tables.py
    R ckan/migration/versions/048_add_activity_streams_tables.py
    R ckan/migration/versions/049_add_group_approval_status.py
    A ckan/migration/versions/049_e0c06c2177b5_add_group_approval_status.py
    A ckan/migration/versions/050_01a6b058cb7f_term_translation_table.py
    R ckan/migration/versions/050_term_translation_table.py
    A ckan/migration/versions/051_a4fb0d85ced6_add_tag_vocabulary.py
    R ckan/migration/versions/051_add_tag_vocabulary.py
    A ckan/migration/versions/052_ba693d64c6d7_update_member_capacities.py
    R ckan/migration/versions/052_update_member_capacities.py
    A ckan/migration/versions/053_9d051a099097_add_group_logo.py
    R ckan/migration/versions/053_add_group_logo.py
    R ckan/migration/versions/054_add_resource_created_date.py
    A ckan/migration/versions/054_da21b38da4db_add_resource_created_date.py
    A ckan/migration/versions/055_048f7db947bf_update_user_and_activity_detail.py
    R ckan/migration/versions/055_update_user_and_activity_detail.py
    A ckan/migration/versions/056_11af3215ae89_add_related_table.py
    R ckan/migration/versions/056_add_related_table.py
    A ckan/migration/versions/057_660a5aae527e_tracking.py
    R ckan/migration/versions/057_tracking.py
    R ckan/migration/versions/058_add_follower_tables.py
    A ckan/migration/versions/058_bd36d1826a5d_add_follower_tables.py
    A ckan/migration/versions/059_9291bb46f352_add_related_count_and_flag.py
    R ckan/migration/versions/059_add_related_count_and_flag.py
    A ckan/migration/versions/060_31ad11c518fc_add_system_info_table.py
    R ckan/migration/versions/060_add_system_info_table.py
    A ckan/migration/versions/061_338d460bc460_add_follower_group_table.py
    R ckan/migration/versions/061_add_follower__group_table.py
    A ckan/migration/versions/062_6deb2bbab394_add_dashboard_table.py
    R ckan/migration/versions/062_add_dashboard_table.py
    A ckan/migration/versions/063_8b633852cb7a_org_changes.py
    R ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_4f8becd4919a_add_email_last_sent_column.py
    R ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_1fab0bc6439e_add_email_notifications_preference.py
    R ckan/migration/versions/065_add_email_notifications_preference.py
    A ckan/migration/versions/066_ad16b3bd8cb6_default_package_type.py
    R ckan/migration/versions/066_default_package_type.py
    A ckan/migration/versions/067_266c110eafec_turn_extras_to_strings.py
    R ckan/migration/versions/067_turn_extras_to_strings.py
    R ckan/migration/versions/068_add_package_extras_index.py
    A ckan/migration/versions/068_e33a5f2b2a84_add_package_extras_index.py
    A ckan/migration/versions/069_e7524c675cdb_resource_url_and_metadata_modified.py
    R ckan/migration/versions/069_resource_url_and_metadata_modified.py
    R ckan/migration/versions/070_add_activity_and_resource_indexes.py
    A ckan/migration/versions/070_cfb544112fa7_add_activity_and_resource_indexes.py
    R ckan/migration/versions/071_add_state_column_to_user_table.py
    A ckan/migration/versions/071_c16f081ef73a_add_state_column_to_user_table.py
    A ckan/migration/versions/072_08dcb9233ad7_add_resource_view.py
    R ckan/migration/versions/072_add_resource_view.py
    A ckan/migration/versions/073_011f51208be3_update_resource_view_resource_id_.py
    R ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    A ckan/migration/versions/074_a4ca55f0f45e_remove_resource_groups.py
    R ckan/migration/versions/074_remove_resource_groups.py
    A ckan/migration/versions/075_9cdc88c8896a_rename_view_plugins.py
    R ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_59995aa965c0_rename_view_plugins_2.py
    R ckan/migration/versions/076_rename_view_plugins_2.py
    A ckan/migration/versions/077_51171a04d86d_add_revisions_to_system_info.py
    R ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_ae821876532a_remove_old_authz_model.py
    R ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_e0177a15d2c9_resource_revision_index.py
    R ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_8224d872c64f_continuity_id_indexes.py
    R ckan/migration/versions/080_continuity_id_indexes.py
    A ckan/migration/versions/081_a64cf4a79182_set_datastore_active.py
    R ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_8ea886d0ede4_create_index_creator_user_id.py
    R ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py
    R ckan/migration/versions/083_remove_related_items.py
    R ckan/migration/versions/084_add_metadata_created.py
    A ckan/migration/versions/084_d85ce5783688_add_metadata_created.py
    R ckan/migration/versions/085_adjust_activity_timestamps.py
    A ckan/migration/versions/085_f9bf3d5c4b4d_adjust_activity_timestamps.py
    A ckan/migration/versions/086_19663581b3bb_drop_openid_column.py
    R ckan/migration/versions/086_drop_openid_column.py
    A ckan/migration/versions/087_ff1b303cab77_remove_old_authorization_tables.py
    R ckan/migration/versions/087_remove_old_authorization_tables.py
    A ckan/migration/versions/088_3537d5420e0e_delete_extrase_which_are_deleted_state.py
    R ckan/migration/versions/088_delete_extras_which_are_deleted_state.py
    A ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py
    R ckan/migration/versions/089_package_activity_migration_check.py
    A ckan/migration/versions/090_980dcd44de4b_delete_migrate_version_table.py
    R ckan/migration/versions/__init__.py
    M ckan/model/__init__.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/test_coding_standards.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #4450 from smotornyuk/alembic

sqlalchemy-migrate -> Alembic

  Commit: 4bac5eac82c253dbaaa74e169c909403d94e5c77
      https://github.com/ckan/ckan/commit/4bac5eac82c253dbaaa74e169c909403d94e5c77
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2019-05-14 (Tue, 14 May 2019)

  Changed paths:
    M ckan/model/tag.py
    R ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_package.py
    A ckan/tests/model/test_package.py
    A ckan/tests/model/test_package_extra.py
    A ckan/tests/model/test_tags.py

  Log Message:
  -----------
  Merge pull request #4776 from ckan/modernize-model-tests

Modernize package model tests

  Commit: f95316fbc4995fa108db8e7fe810409ed37185d0
      https://github.com/ckan/ckan/commit/f95316fbc4995fa108db8e7fe810409ed37185d0
  Author: Ian Ward <ian at excess.org>
  Date:   2019-05-14 (Tue, 14 May 2019)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    R ckan/public-bs2/base/css/.gitignore
    R ckan/public-bs2/base/css/fuchsia.css
    R ckan/public-bs2/base/css/green.css
    R ckan/public-bs2/base/css/main.css
    R ckan/public-bs2/base/css/maroon.css
    R ckan/public-bs2/base/css/red.css
    R ckan/public-bs2/base/i18n/.gitignore
    R ckan/public-bs2/base/images/background-tag-ie7.png
    R ckan/public-bs2/base/images/background-tag.png
    R ckan/public-bs2/base/images/background-tile.png
    R ckan/public-bs2/base/images/bg.png
    R ckan/public-bs2/base/images/breadcrumb-slash-ie7.png
    R ckan/public-bs2/base/images/ckan-logo-footer.png
    R ckan/public-bs2/base/images/ckan-logo-white.svg
    R ckan/public-bs2/base/images/ckan-logo.png
    R ckan/public-bs2/base/images/ckan-logo.svg
    R ckan/public-bs2/base/images/ckan.ico
    R ckan/public-bs2/base/images/dashboard-followee-related.png
    R ckan/public-bs2/base/images/dotted.png
    R ckan/public-bs2/base/images/editing.png
    R ckan/public-bs2/base/images/full-width-nav-right.png
    R ckan/public-bs2/base/images/icon-search-27x26.png
    R ckan/public-bs2/base/images/loading-spinner.gif
    R ckan/public-bs2/base/images/nav-active.png
    R ckan/public-bs2/base/images/nav.png
    R ckan/public-bs2/base/images/od_80x15_blue.png
    R ckan/public-bs2/base/images/placeholder-200x125.png
    R ckan/public-bs2/base/images/placeholder-420x220.png
    R ckan/public-bs2/base/images/placeholder-680x400.png
    R ckan/public-bs2/base/images/placeholder-application.png
    R ckan/public-bs2/base/images/placeholder-group.png
    R ckan/public-bs2/base/images/placeholder-image.png
    R ckan/public-bs2/base/images/placeholder-organization.png
    R ckan/public-bs2/base/images/sprite-ckan-icons.png
    R ckan/public-bs2/base/images/sprite-resource-icons.png
    R ckan/public-bs2/base/images/table-seperator.png
    R ckan/public-bs2/base/javascript/client.js
    R ckan/public-bs2/base/javascript/i18n.js
    R ckan/public-bs2/base/javascript/main.js
    R ckan/public-bs2/base/javascript/module.js
    R ckan/public-bs2/base/javascript/modules/activity-stream.js
    R ckan/public-bs2/base/javascript/modules/api-info.js
    R ckan/public-bs2/base/javascript/modules/autocomplete.js
    R ckan/public-bs2/base/javascript/modules/basic-form.js
    R ckan/public-bs2/base/javascript/modules/confirm-action.js
    R ckan/public-bs2/base/javascript/modules/custom-fields.js
    R ckan/public-bs2/base/javascript/modules/dashboard.js
    R ckan/public-bs2/base/javascript/modules/data-viewer.js
    R ckan/public-bs2/base/javascript/modules/dataset-visibility.js
    R ckan/public-bs2/base/javascript/modules/follow.js
    R ckan/public-bs2/base/javascript/modules/followers-counter.js
    R ckan/public-bs2/base/javascript/modules/image-upload.js
    R ckan/public-bs2/base/javascript/modules/media-grid.js
    R ckan/public-bs2/base/javascript/modules/popover-context.js
    R ckan/public-bs2/base/javascript/modules/resource-form.js
    R ckan/public-bs2/base/javascript/modules/resource-reorder.js
    R ckan/public-bs2/base/javascript/modules/resource-upload-field.js
    R ckan/public-bs2/base/javascript/modules/resource-view-embed.js
    R ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    R ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    R ckan/public-bs2/base/javascript/modules/resource-view-reorder.js
    R ckan/public-bs2/base/javascript/modules/select-switch.js
    R ckan/public-bs2/base/javascript/modules/slug-preview.js
    R ckan/public-bs2/base/javascript/modules/table-selectable-rows.js
    R ckan/public-bs2/base/javascript/modules/table-toggle-more.js
    R ckan/public-bs2/base/javascript/notify.js
    R ckan/public-bs2/base/javascript/plugins/jquery.date-helpers.js
    R ckan/public-bs2/base/javascript/plugins/jquery.form-warning.js
    R ckan/public-bs2/base/javascript/plugins/jquery.images-loaded.js
    R ckan/public-bs2/base/javascript/plugins/jquery.inherit.js
    R ckan/public-bs2/base/javascript/plugins/jquery.masonry.js
    R ckan/public-bs2/base/javascript/plugins/jquery.proxy-all.js
    R ckan/public-bs2/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public-bs2/base/javascript/plugins/jquery.slug.js
    R ckan/public-bs2/base/javascript/plugins/jquery.truncator.js
    R ckan/public-bs2/base/javascript/plugins/jquery.url-helpers.js
    R ckan/public-bs2/base/javascript/pubsub.js
    R ckan/public-bs2/base/javascript/resource.config
    R ckan/public-bs2/base/javascript/sandbox.js
    R ckan/public-bs2/base/javascript/tracking.js
    R ckan/public-bs2/base/javascript/view-filters.js
    R ckan/public-bs2/base/less/activity.less
    R ckan/public-bs2/base/less/ckan.less
    R ckan/public-bs2/base/less/custom.less
    R ckan/public-bs2/base/less/dashboard.less
    R ckan/public-bs2/base/less/datapusher.less
    R ckan/public-bs2/base/less/dataset.less
    R ckan/public-bs2/base/less/dropdown.less
    R ckan/public-bs2/base/less/footer.less
    R ckan/public-bs2/base/less/forms.less
    R ckan/public-bs2/base/less/group.less
    R ckan/public-bs2/base/less/homepage.less
    R ckan/public-bs2/base/less/icons.less
    R ckan/public-bs2/base/less/iehacks.less
    R ckan/public-bs2/base/less/layout.less
    R ckan/public-bs2/base/less/main.less
    R ckan/public-bs2/base/less/masthead.less
    R ckan/public-bs2/base/less/media.less
    R ckan/public-bs2/base/less/mixins.less
    R ckan/public-bs2/base/less/module.less
    R ckan/public-bs2/base/less/nav.less
    R ckan/public-bs2/base/less/profile.less
    R ckan/public-bs2/base/less/prose.less
    R ckan/public-bs2/base/less/resource-view.less
    R ckan/public-bs2/base/less/search.less
    R ckan/public-bs2/base/less/tables.less
    R ckan/public-bs2/base/less/toolbar.less
    R ckan/public-bs2/base/less/variables.less
    R ckan/public-bs2/base/test/index.html
    R ckan/public-bs2/base/test/primer/index.html
    R ckan/public-bs2/base/test/spec/ckan.spec.js
    R ckan/public-bs2/base/test/spec/client.spec.js
    R ckan/public-bs2/base/test/spec/i18n.spec.js
    R ckan/public-bs2/base/test/spec/module.spec.js
    R ckan/public-bs2/base/test/spec/modules/autocomplete.spec.js
    R ckan/public-bs2/base/test/spec/modules/basic-form.spec.js
    R ckan/public-bs2/base/test/spec/modules/confirm-action.spec.js
    R ckan/public-bs2/base/test/spec/modules/custom-fields.spec.js
    R ckan/public-bs2/base/test/spec/modules/followers-counter.spec.js
    R ckan/public-bs2/base/test/spec/modules/image-upload.spec.js
    R ckan/public-bs2/base/test/spec/modules/resource-form.spec.js
    R ckan/public-bs2/base/test/spec/modules/resource-upload-field.spec.js
    R ckan/public-bs2/base/test/spec/notify.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.date-helpers.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.form-warning.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.inherit.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.proxy-all.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.js
    R ckan/public-bs2/base/test/spec/pubsub.spec.js
    R ckan/public-bs2/base/test/spec/sandbox.spec.js
    R ckan/public-bs2/base/test/spec/view-filters.spec.js
    R ckan/public-bs2/base/test/vendor/chai.js
    R ckan/public-bs2/base/test/vendor/less.js
    R ckan/public-bs2/base/test/vendor/mocha.css
    R ckan/public-bs2/base/test/vendor/mocha.js
    R ckan/public-bs2/base/test/vendor/sinon.js
    R ckan/public-bs2/base/vendor/bootstrap.js
    R ckan/public-bs2/base/vendor/bootstrap.min.js
    R ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.js
    R ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.min.js
    R ckan/public-bs2/base/vendor/bootstrap/less/accordion.less
    R ckan/public-bs2/base/vendor/bootstrap/less/alerts.less
    R ckan/public-bs2/base/vendor/bootstrap/less/bootstrap.less
    R ckan/public-bs2/base/vendor/bootstrap/less/breadcrumbs.less
    R ckan/public-bs2/base/vendor/bootstrap/less/button-groups.less
    R ckan/public-bs2/base/vendor/bootstrap/less/buttons.less
    R ckan/public-bs2/base/vendor/bootstrap/less/carousel.less
    R ckan/public-bs2/base/vendor/bootstrap/less/close.less
    R ckan/public-bs2/base/vendor/bootstrap/less/code.less
    R ckan/public-bs2/base/vendor/bootstrap/less/component-animations.less
    R ckan/public-bs2/base/vendor/bootstrap/less/dropdowns.less
    R ckan/public-bs2/base/vendor/bootstrap/less/forms.less
    R ckan/public-bs2/base/vendor/bootstrap/less/grid.less
    R ckan/public-bs2/base/vendor/bootstrap/less/hero-unit.less
    R ckan/public-bs2/base/vendor/bootstrap/less/labels-badges.less
    R ckan/public-bs2/base/vendor/bootstrap/less/layouts.less
    R ckan/public-bs2/base/vendor/bootstrap/less/media.less
    R ckan/public-bs2/base/vendor/bootstrap/less/mixins.less
    R ckan/public-bs2/base/vendor/bootstrap/less/modals.less
    R ckan/public-bs2/base/vendor/bootstrap/less/navbar.less
    R ckan/public-bs2/base/vendor/bootstrap/less/navs.less
    R ckan/public-bs2/base/vendor/bootstrap/less/pager.less
    R ckan/public-bs2/base/vendor/bootstrap/less/pagination.less
    R ckan/public-bs2/base/vendor/bootstrap/less/popovers.less
    R ckan/public-bs2/base/vendor/bootstrap/less/progress-bars.less
    R ckan/public-bs2/base/vendor/bootstrap/less/reset.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-1200px-min.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-767px-max.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-768px-979px.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-navbar.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-utilities.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive.less
    R ckan/public-bs2/base/vendor/bootstrap/less/scaffolding.less
    R ckan/public-bs2/base/vendor/bootstrap/less/sprites.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tables.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/buttons.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.css
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/forms-responsive.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/forms.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-static-top.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public-bs2/base/vendor/bootstrap/less/thumbnails.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tooltip.less
    R ckan/public-bs2/base/vendor/bootstrap/less/type.less
    R ckan/public-bs2/base/vendor/bootstrap/less/utilities.less
    R ckan/public-bs2/base/vendor/bootstrap/less/variables.less
    R ckan/public-bs2/base/vendor/bootstrap/less/wells.less
    R ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.css
    R ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public-bs2/base/vendor/font-awesome/fonts/FontAwesome.otf
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public-bs2/base/vendor/font-awesome/less/bordered-pulled.less
    R ckan/public-bs2/base/vendor/font-awesome/less/core.less
    R ckan/public-bs2/base/vendor/font-awesome/less/extras.less
    R ckan/public-bs2/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public-bs2/base/vendor/font-awesome/less/font-awesome.less
    R ckan/public-bs2/base/vendor/font-awesome/less/icons.less
    R ckan/public-bs2/base/vendor/font-awesome/less/larger.less
    R ckan/public-bs2/base/vendor/font-awesome/less/list.less
    R ckan/public-bs2/base/vendor/font-awesome/less/mixins.less
    R ckan/public-bs2/base/vendor/font-awesome/less/path.less
    R ckan/public-bs2/base/vendor/font-awesome/less/rotated-flipped.less
    R ckan/public-bs2/base/vendor/font-awesome/less/spinning.less
    R ckan/public-bs2/base/vendor/font-awesome/less/stacked.less
    R ckan/public-bs2/base/vendor/font-awesome/less/variables.less
    R ckan/public-bs2/base/vendor/html5.js
    R ckan/public-bs2/base/vendor/html5.min.js
    R ckan/public-bs2/base/vendor/jed.js
    R ckan/public-bs2/base/vendor/jed.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    R ckan/public-bs2/base/vendor/jquery.js
    R ckan/public-bs2/base/vendor/jquery.min.js
    R ckan/public-bs2/base/vendor/jquery.ui.core.js
    R ckan/public-bs2/base/vendor/jquery.ui.mouse.js
    R ckan/public-bs2/base/vendor/jquery.ui.sortable.js
    R ckan/public-bs2/base/vendor/jquery.ui.widget.js
    R ckan/public-bs2/base/vendor/moment-with-locales.js
    R ckan/public-bs2/base/vendor/polyfill-object-keys.js
    R ckan/public-bs2/base/vendor/resource.config
    R ckan/public-bs2/base/vendor/select2/.gitignore
    R ckan/public-bs2/base/vendor/select2/CONTRIBUTING.md
    R ckan/public-bs2/base/vendor/select2/LICENSE
    R ckan/public-bs2/base/vendor/select2/README.md
    R ckan/public-bs2/base/vendor/select2/bower.json
    R ckan/public-bs2/base/vendor/select2/component.json
    R ckan/public-bs2/base/vendor/select2/composer.json
    R ckan/public-bs2/base/vendor/select2/package.json
    R ckan/public-bs2/base/vendor/select2/release.sh
    R ckan/public-bs2/base/vendor/select2/select2-bootstrap.css
    R ckan/public-bs2/base/vendor/select2/select2-spinner.gif
    R ckan/public-bs2/base/vendor/select2/select2.css
    R ckan/public-bs2/base/vendor/select2/select2.jquery.json
    R ckan/public-bs2/base/vendor/select2/select2.js
    R ckan/public-bs2/base/vendor/select2/select2.min.js
    R ckan/public-bs2/base/vendor/select2/select2.png
    R ckan/public-bs2/base/vendor/select2/select2_locale_ar.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_az.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_bg.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ca.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_cs.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_da.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_de.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_el.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_en.js.template
    R ckan/public-bs2/base/vendor/select2/select2_locale_es.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_et.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_eu.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fa.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fi.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_gl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_he.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_hr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_hu.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_id.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_is.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_it.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ja.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ka.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ko.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_lt.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_lv.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_mk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ms.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_nb.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_nl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pt-BR.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pt-PT.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ro.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_rs.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ru.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_sk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_sv.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_th.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_tr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ug-CN.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_uk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_vi.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_zh-CN.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_zh-TW.js
    R ckan/public-bs2/base/vendor/select2/select2x2.png
    R ckan/templates-bs2/activity_streams/activity_stream_email_notifications.text
    R ckan/templates-bs2/activity_streams/activity_stream_items.html
    R ckan/templates-bs2/admin/base.html
    R ckan/templates-bs2/admin/config.html
    R ckan/templates-bs2/admin/confirm_reset.html
    R ckan/templates-bs2/admin/index.html
    R ckan/templates-bs2/admin/trash.html
    R ckan/templates-bs2/ajax_snippets/custom_fields.html
    R ckan/templates-bs2/ajax_snippets/follow_button.html
    R ckan/templates-bs2/base.html
    R ckan/templates-bs2/dataviewer/base.html
    R ckan/templates-bs2/dataviewer/snippets/data_preview.html
    R ckan/templates-bs2/dataviewer/snippets/no_preview.html
    R ckan/templates-bs2/development/primer.html
    R ckan/templates-bs2/development/snippets/actions.html
    R ckan/templates-bs2/development/snippets/breadcrumb.html
    R ckan/templates-bs2/development/snippets/context.html
    R ckan/templates-bs2/development/snippets/facet.html
    R ckan/templates-bs2/development/snippets/form.html
    R ckan/templates-bs2/development/snippets/form_stages.html
    R ckan/templates-bs2/development/snippets/list.html
    R ckan/templates-bs2/development/snippets/media_grid.html
    R ckan/templates-bs2/development/snippets/module.html
    R ckan/templates-bs2/development/snippets/nav.html
    R ckan/templates-bs2/development/snippets/page_header.html
    R ckan/templates-bs2/development/snippets/pagination.html
    R ckan/templates-bs2/development/snippets/simple-input.html
    R ckan/templates-bs2/emails/invite_user.txt
    R ckan/templates-bs2/emails/invite_user_subject.txt
    R ckan/templates-bs2/emails/reset_password.txt
    R ckan/templates-bs2/emails/reset_password_subject.txt
    R ckan/templates-bs2/error_document_template.html
    R ckan/templates-bs2/footer.html
    R ckan/templates-bs2/group/about.html
    R ckan/templates-bs2/group/activity_stream.html
    R ckan/templates-bs2/group/admins.html
    R ckan/templates-bs2/group/base_form_page.html
    R ckan/templates-bs2/group/confirm_delete.html
    R ckan/templates-bs2/group/confirm_delete_member.html
    R ckan/templates-bs2/group/edit.html
    R ckan/templates-bs2/group/edit_base.html
    R ckan/templates-bs2/group/followers.html
    R ckan/templates-bs2/group/index.html
    R ckan/templates-bs2/group/member_new.html
    R ckan/templates-bs2/group/members.html
    R ckan/templates-bs2/group/new.html
    R ckan/templates-bs2/group/new_group_form.html
    R ckan/templates-bs2/group/read.html
    R ckan/templates-bs2/group/read_base.html
    R ckan/templates-bs2/group/snippets/feeds.html
    R ckan/templates-bs2/group/snippets/group_form.html
    R ckan/templates-bs2/group/snippets/group_item.html
    R ckan/templates-bs2/group/snippets/group_list.html
    R ckan/templates-bs2/group/snippets/helper.html
    R ckan/templates-bs2/group/snippets/info.html
    R ckan/templates-bs2/header.html
    R ckan/templates-bs2/home/about.html
    R ckan/templates-bs2/home/index.html
    R ckan/templates-bs2/home/layout1.html
    R ckan/templates-bs2/home/layout2.html
    R ckan/templates-bs2/home/layout3.html
    R ckan/templates-bs2/home/snippets/about_text.html
    R ckan/templates-bs2/home/snippets/featured_group.html
    R ckan/templates-bs2/home/snippets/featured_organization.html
    R ckan/templates-bs2/home/snippets/promoted.html
    R ckan/templates-bs2/home/snippets/search.html
    R ckan/templates-bs2/home/snippets/stats.html
    R ckan/templates-bs2/macros/autoform.html
    R ckan/templates-bs2/macros/form.html
    R ckan/templates-bs2/organization/about.html
    R ckan/templates-bs2/organization/activity_stream.html
    R ckan/templates-bs2/organization/admins.html
    R ckan/templates-bs2/organization/base_form_page.html
    R ckan/templates-bs2/organization/bulk_process.html
    R ckan/templates-bs2/organization/confirm_delete.html
    R ckan/templates-bs2/organization/confirm_delete_member.html
    R ckan/templates-bs2/organization/edit.html
    R ckan/templates-bs2/organization/edit_base.html
    R ckan/templates-bs2/organization/index.html
    R ckan/templates-bs2/organization/member_new.html
    R ckan/templates-bs2/organization/members.html
    R ckan/templates-bs2/organization/new.html
    R ckan/templates-bs2/organization/new_organization_form.html
    R ckan/templates-bs2/organization/read.html
    R ckan/templates-bs2/organization/read_base.html
    R ckan/templates-bs2/organization/snippets/feeds.html
    R ckan/templates-bs2/organization/snippets/help.html
    R ckan/templates-bs2/organization/snippets/helper.html
    R ckan/templates-bs2/organization/snippets/info.html
    R ckan/templates-bs2/organization/snippets/organization_form.html
    R ckan/templates-bs2/organization/snippets/organization_item.html
    R ckan/templates-bs2/organization/snippets/organization_list.html
    R ckan/templates-bs2/package/activity.html
    R ckan/templates-bs2/package/base.html
    R ckan/templates-bs2/package/base_form_page.html
    R ckan/templates-bs2/package/confirm_delete.html
    R ckan/templates-bs2/package/confirm_delete_resource.html
    R ckan/templates-bs2/package/edit.html
    R ckan/templates-bs2/package/edit_base.html
    R ckan/templates-bs2/package/edit_view.html
    R ckan/templates-bs2/package/followers.html
    R ckan/templates-bs2/package/group_list.html
    R ckan/templates-bs2/package/new.html
    R ckan/templates-bs2/package/new_package_form.html
    R ckan/templates-bs2/package/new_resource.html
    R ckan/templates-bs2/package/new_resource_not_draft.html
    R ckan/templates-bs2/package/new_view.html
    R ckan/templates-bs2/package/read.html
    R ckan/templates-bs2/package/read_base.html
    R ckan/templates-bs2/package/resource_edit.html
    R ckan/templates-bs2/package/resource_edit_base.html
    R ckan/templates-bs2/package/resource_read.html
    R ckan/templates-bs2/package/resource_views.html
    R ckan/templates-bs2/package/resources.html
    R ckan/templates-bs2/package/search.html
    R ckan/templates-bs2/package/snippets/additional_info.html
    R ckan/templates-bs2/package/snippets/cannot_create_package.html
    R ckan/templates-bs2/package/snippets/info.html
    R ckan/templates-bs2/package/snippets/new_package_breadcrumb.html
    R ckan/templates-bs2/package/snippets/package_basic_fields.html
    R ckan/templates-bs2/package/snippets/package_form.html
    R ckan/templates-bs2/package/snippets/package_metadata_fields.html
    R ckan/templates-bs2/package/snippets/resource_edit_form.html
    R ckan/templates-bs2/package/snippets/resource_form.html
    R ckan/templates-bs2/package/snippets/resource_help.html
    R ckan/templates-bs2/package/snippets/resource_info.html
    R ckan/templates-bs2/package/snippets/resource_item.html
    R ckan/templates-bs2/package/snippets/resource_view.html
    R ckan/templates-bs2/package/snippets/resource_view_embed.html
    R ckan/templates-bs2/package/snippets/resource_view_filters.html
    R ckan/templates-bs2/package/snippets/resource_views_list.html
    R ckan/templates-bs2/package/snippets/resource_views_list_item.html
    R ckan/templates-bs2/package/snippets/resources.html
    R ckan/templates-bs2/package/snippets/resources_list.html
    R ckan/templates-bs2/package/snippets/stages.html
    R ckan/templates-bs2/package/snippets/tags.html
    R ckan/templates-bs2/package/snippets/view_form.html
    R ckan/templates-bs2/package/snippets/view_form_filters.html
    R ckan/templates-bs2/package/snippets/view_help.html
    R ckan/templates-bs2/package/view_edit_base.html
    R ckan/templates-bs2/page.html
    R ckan/templates-bs2/revision/__init__.py
    R ckan/templates-bs2/robots.txt
    R ckan/templates-bs2/snippets/activities/added_tag.html
    R ckan/templates-bs2/snippets/activities/changed_group.html
    R ckan/templates-bs2/snippets/activities/changed_organization.html
    R ckan/templates-bs2/snippets/activities/changed_package.html
    R ckan/templates-bs2/snippets/activities/changed_resource.html
    R ckan/templates-bs2/snippets/activities/changed_user.html
    R ckan/templates-bs2/snippets/activities/deleted_group.html
    R ckan/templates-bs2/snippets/activities/deleted_organization.html
    R ckan/templates-bs2/snippets/activities/deleted_package.html
    R ckan/templates-bs2/snippets/activities/deleted_resource.html
    R ckan/templates-bs2/snippets/activities/fallback.html
    R ckan/templates-bs2/snippets/activities/follow_dataset.html
    R ckan/templates-bs2/snippets/activities/follow_group.html
    R ckan/templates-bs2/snippets/activities/follow_user.html
    R ckan/templates-bs2/snippets/activities/new_group.html
    R ckan/templates-bs2/snippets/activities/new_organization.html
    R ckan/templates-bs2/snippets/activities/new_package.html
    R ckan/templates-bs2/snippets/activities/new_resource.html
    R ckan/templates-bs2/snippets/activities/new_user.html
    R ckan/templates-bs2/snippets/activities/removed_tag.html
    R ckan/templates-bs2/snippets/activity_stream.html
    R ckan/templates-bs2/snippets/additional_info.html
    R ckan/templates-bs2/snippets/context.html
    R ckan/templates-bs2/snippets/context/dataset.html
    R ckan/templates-bs2/snippets/context/group.html
    R ckan/templates-bs2/snippets/context/user.html
    R ckan/templates-bs2/snippets/custom_form_fields.html
    R ckan/templates-bs2/snippets/datapreview_embed_dialog.html
    R ckan/templates-bs2/snippets/datapusher_status.html
    R ckan/templates-bs2/snippets/debug.html
    R ckan/templates-bs2/snippets/disqus_trackback.html
    R ckan/templates-bs2/snippets/facet_list.html
    R ckan/templates-bs2/snippets/follow_button.html
    R ckan/templates-bs2/snippets/group.html
    R ckan/templates-bs2/snippets/group_item.html
    R ckan/templates-bs2/snippets/home_breadcrumb_item.html
    R ckan/templates-bs2/snippets/language_selector.html
    R ckan/templates-bs2/snippets/license.html
    R ckan/templates-bs2/snippets/local_friendly_datetime.html
    R ckan/templates-bs2/snippets/organization.html
    R ckan/templates-bs2/snippets/organization_item.html
    R ckan/templates-bs2/snippets/package_grid.html
    R ckan/templates-bs2/snippets/package_item.html
    R ckan/templates-bs2/snippets/package_list.html
    R ckan/templates-bs2/snippets/popular.html
    R ckan/templates-bs2/snippets/private.html
    R ckan/templates-bs2/snippets/search_form.html
    R ckan/templates-bs2/snippets/search_result_text.html
    R ckan/templates-bs2/snippets/simple_search.html
    R ckan/templates-bs2/snippets/social.html
    R ckan/templates-bs2/snippets/sort_by.html
    R ckan/templates-bs2/snippets/subscribe.html
    R ckan/templates-bs2/snippets/tag_list.html
    R ckan/templates-bs2/tag/index.html
    R ckan/templates-bs2/tests/broken_helper_as_attribute.html
    R ckan/templates-bs2/tests/broken_helper_as_item.html
    R ckan/templates-bs2/tests/flash_messages.html
    R ckan/templates-bs2/tests/helper_as_attribute.html
    R ckan/templates-bs2/tests/helper_as_item.html
    R ckan/templates-bs2/tests/mock_json_resource_preview_template.html
    R ckan/templates-bs2/tests/mock_resource_preview_template.html
    R ckan/templates-bs2/user/activity_stream.html
    R ckan/templates-bs2/user/dashboard.html
    R ckan/templates-bs2/user/dashboard_datasets.html
    R ckan/templates-bs2/user/dashboard_groups.html
    R ckan/templates-bs2/user/dashboard_organizations.html
    R ckan/templates-bs2/user/edit.html
    R ckan/templates-bs2/user/edit_base.html
    R ckan/templates-bs2/user/edit_user_form.html
    R ckan/templates-bs2/user/followers.html
    R ckan/templates-bs2/user/list.html
    R ckan/templates-bs2/user/login.html
    R ckan/templates-bs2/user/logout.html
    R ckan/templates-bs2/user/logout_first.html
    R ckan/templates-bs2/user/new.html
    R ckan/templates-bs2/user/new_user_form.html
    R ckan/templates-bs2/user/perform_reset.html
    R ckan/templates-bs2/user/read.html
    R ckan/templates-bs2/user/read_base.html
    R ckan/templates-bs2/user/request_reset.html
    R ckan/templates-bs2/user/snippets/followee_dropdown.html
    R ckan/templates-bs2/user/snippets/followers.html
    R ckan/templates-bs2/user/snippets/login_form.html
    R ckan/templates-bs2/user/snippets/recaptcha.html
    R ckan/templates-bs2/user/snippets/user_search.html
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #4780 from ckan/4779-remove-bs2

[#4779] Remove Bootstrap 2 templates and public folder

  Commit: b4173af9590fdbff46cc24bfd4610b3782b5371c
      https://github.com/ckan/ckan/commit/b4173af9590fdbff46cc24bfd4610b3782b5371c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-05-14 (Tue, 14 May 2019)

  Changed paths:
    M .gitignore
    M ckan/cli/db.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/migration/README
    M ckan/migration/__init__.py
    A ckan/migration/alembic.ini
    A ckan/migration/env.py
    R ckan/migration/manage.py
    R ckan/migration/migrate.cfg
    A ckan/migration/script.py.mako
    A ckan/migration/versions/001_103676e0a497_create_existing_tables.py
    R ckan/migration/versions/001_add_existing_tables.py
    A ckan/migration/versions/002_86fdd8c54775_add_author_and_maintainer.py
    R ckan/migration/versions/002_add_author_and_maintainer.py
    R ckan/migration/versions/003_add_user_object.py
    A ckan/migration/versions/003_f22b4f5241a5_add_user_object.py
    R ckan/migration/versions/004_add_group_object.py
    A ckan/migration/versions/004_f92ee205e46d_add_group_object.py
    A ckan/migration/versions/005_12c2232c15f5_add_authorization_tables.py
    R ckan/migration/versions/005_add_authorization_tables.py
    R ckan/migration/versions/006_add_ratings.py
    A ckan/migration/versions/006_c83955e7acb6_add_ratings.py
    A ckan/migration/versions/007_1928d4af1cda_add_system_roles.py
    R ckan/migration/versions/007_add_system_roles.py
    A ckan/migration/versions/008_e8283ffb257e_update_vdm_ids.py
    R ckan/migration/versions/008_update_vdm_ids.py
    R ckan/migration/versions/009_add_creation_timestamps.py
    A ckan/migration/versions/009_b739a48de5c4_add_creation_timestamps.py
    A ckan/migration/versions/010_a6f13bf14d0c_add_user_about.py
    R ckan/migration/versions/010_add_user_about.py
    A ckan/migration/versions/011_866f6370b4ac_add_package_search_vector.py
    R ckan/migration/versions/011_add_package_search_vector.py
    R ckan/migration/versions/012_add_resources.py
    A ckan/migration/versions/012_e5ca33a5d445_add_resources.py
    A ckan/migration/versions/013_8a3a5af39797_add_hash.py
    R ckan/migration/versions/013_add_hash.py
    A ckan/migration/versions/014_93519b684820_hash_2.py
    R ckan/migration/versions/014_hash_2.py
    A ckan/migration/versions/015_6d8ffebcaf54_remove_state_object.py
    R ckan/migration/versions/015_remove_state_object.py
    A ckan/migration/versions/016_37ada738328e_uuids_everywhere.py
    R ckan/migration/versions/016_uuids_everywhere.py
    A ckan/migration/versions/017_1250b2ff3e36_add_pkg_relationships.py
    R ckan/migration/versions/017_add_pkg_relationships.py
    A ckan/migration/versions/018_05a0778051ca_adjust_licenses.py
    R ckan/migration/versions/018_adjust_licenses.py
    A ckan/migration/versions/019_b2eb6f34a638_pkg_relationships_state.py
    R ckan/migration/versions/019_pkg_relationships_state.py
    A ckan/migration/versions/020_69a0b0efc609_add_changeset.py
    R ckan/migration/versions/020_add_changeset.py
    A ckan/migration/versions/021_765143af2ba3_postgresql_upgrade_sql.py
    R ckan/migration/versions/021_postgres_downgrade.sql
    R ckan/migration/versions/021_postgres_upgrade.sql
    R ckan/migration/versions/021_postgresql_downgrade.sql
    R ckan/migration/versions/021_postgresql_upgrade.sql
    A ckan/migration/versions/022_7b324ca6c0dc_add_group_extras.py
    R ckan/migration/versions/022_add_group_extras.py
    A ckan/migration/versions/023_87fdd05f0744_add_harvesting.py
    R ckan/migration/versions/023_add_harvesting.py
    A ckan/migration/versions/024_12981fe12484_add_harvested_document.py
    R ckan/migration/versions/024_add_harvested_document.py
    R ckan/migration/versions/025_add_authorization_groups.py
    A ckan/migration/versions/025_b581622ad327_add_authorization_groups.py
    A ckan/migration/versions/026_3615b25af443_authorization_group_user_pk.py
    R ckan/migration/versions/026_authorization_group_user_pk.py
    A ckan/migration/versions/027_11e5745c6fc9_adjust_harvester.py
    R ckan/migration/versions/027_adjust_harvester.py
    A ckan/migration/versions/028_cdd68fe9ba21_drop_harvest_source_status.py
    R ckan/migration/versions/028_drop_harvest_source_status.py
    A ckan/migration/versions/029_1bfdf4240915_version_groups.py
    R ckan/migration/versions/029_version_groups.py
    R ckan/migration/versions/030_additional_user_attributes.py
    A ckan/migration/versions/030_b16cbf164c8a_additional_user_attributes.py
    A ckan/migration/versions/031_1b05245167d6_move_openid_to_new_field.py
    R ckan/migration/versions/031_move_openid_to_new_field.py
    R ckan/migration/versions/032_add_extra_info_field_to_resources.py
    A ckan/migration/versions/032_d89e0731422d_add_extra_info_field_to_resources.py
    A ckan/migration/versions/033_6da92ef2df15_auth_group_user_id_add_conditional.py
    R ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    A ckan/migration/versions/034_6c600693af5b_resource_group_table.py
    R ckan/migration/versions/034_resource_group_table.py
    A ckan/migration/versions/035_81148ccebd6c_harvesting_doc_versioning.py
    R ckan/migration/versions/035_harvesting_doc_versioning.py
    A ckan/migration/versions/036_ecaa8b38782f_lockdown_roles.py
    R ckan/migration/versions/036_lockdown_roles.py
    A ckan/migration/versions/037_edcf3b8c3c1b_role_anon_editor.py
    R ckan/migration/versions/037_role_anon_editor.py
    R ckan/migration/versions/038_delete_migration_tables.py
    A ckan/migration/versions/038_fd6622e3d964_delete_migration_tables.py
    R ckan/migration/versions/039_add_expired_id_and_dates.py
    A ckan/migration/versions/039_cca459c76d45_add_expired_id_and_dates.py
    A ckan/migration/versions/040_500a08f4818e_reset_key_on_user.py
    R ckan/migration/versions/040_reset_key_on_user.py
    A ckan/migration/versions/041_6817d4e3bdc3_resource_new_fields.py
    R ckan/migration/versions/041_resource_new_fields.py
    A ckan/migration/versions/042_da65e2877034_user_revision_indexes.py
    R ckan/migration/versions/042_user_revision_indexes.py
    A ckan/migration/versions/043_bd38cd6502b2_drop_postgres_search.py
    R ckan/migration/versions/043_drop_postgres_search.py
    A ckan/migration/versions/044_4190eeeb8d73_add_task_status.py
    R ckan/migration/versions/044_add_task_status.py
    A ckan/migration/versions/045_54e3f155d945_user_name_unique.py
    R ckan/migration/versions/045_user_name_unique.py
    A ckan/migration/versions/046_b69e9b80396f_drop_changesets.py
    R ckan/migration/versions/046_drop_changesets.py
    A ckan/migration/versions/047_883a7c406926_rename_package_group_member.py
    R ckan/migration/versions/047_rename_package_group_member.py
    A ckan/migration/versions/048_4a7011172b3f_add_activity_streams_tables.py
    R ckan/migration/versions/048_add_activity_streams_tables.py
    R ckan/migration/versions/049_add_group_approval_status.py
    A ckan/migration/versions/049_e0c06c2177b5_add_group_approval_status.py
    A ckan/migration/versions/050_01a6b058cb7f_term_translation_table.py
    R ckan/migration/versions/050_term_translation_table.py
    A ckan/migration/versions/051_a4fb0d85ced6_add_tag_vocabulary.py
    R ckan/migration/versions/051_add_tag_vocabulary.py
    A ckan/migration/versions/052_ba693d64c6d7_update_member_capacities.py
    R ckan/migration/versions/052_update_member_capacities.py
    A ckan/migration/versions/053_9d051a099097_add_group_logo.py
    R ckan/migration/versions/053_add_group_logo.py
    R ckan/migration/versions/054_add_resource_created_date.py
    A ckan/migration/versions/054_da21b38da4db_add_resource_created_date.py
    A ckan/migration/versions/055_048f7db947bf_update_user_and_activity_detail.py
    R ckan/migration/versions/055_update_user_and_activity_detail.py
    A ckan/migration/versions/056_11af3215ae89_add_related_table.py
    R ckan/migration/versions/056_add_related_table.py
    A ckan/migration/versions/057_660a5aae527e_tracking.py
    R ckan/migration/versions/057_tracking.py
    R ckan/migration/versions/058_add_follower_tables.py
    A ckan/migration/versions/058_bd36d1826a5d_add_follower_tables.py
    A ckan/migration/versions/059_9291bb46f352_add_related_count_and_flag.py
    R ckan/migration/versions/059_add_related_count_and_flag.py
    A ckan/migration/versions/060_31ad11c518fc_add_system_info_table.py
    R ckan/migration/versions/060_add_system_info_table.py
    A ckan/migration/versions/061_338d460bc460_add_follower_group_table.py
    R ckan/migration/versions/061_add_follower__group_table.py
    A ckan/migration/versions/062_6deb2bbab394_add_dashboard_table.py
    R ckan/migration/versions/062_add_dashboard_table.py
    A ckan/migration/versions/063_8b633852cb7a_org_changes.py
    R ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_4f8becd4919a_add_email_last_sent_column.py
    R ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_1fab0bc6439e_add_email_notifications_preference.py
    R ckan/migration/versions/065_add_email_notifications_preference.py
    A ckan/migration/versions/066_ad16b3bd8cb6_default_package_type.py
    R ckan/migration/versions/066_default_package_type.py
    A ckan/migration/versions/067_266c110eafec_turn_extras_to_strings.py
    R ckan/migration/versions/067_turn_extras_to_strings.py
    R ckan/migration/versions/068_add_package_extras_index.py
    A ckan/migration/versions/068_e33a5f2b2a84_add_package_extras_index.py
    A ckan/migration/versions/069_e7524c675cdb_resource_url_and_metadata_modified.py
    R ckan/migration/versions/069_resource_url_and_metadata_modified.py
    R ckan/migration/versions/070_add_activity_and_resource_indexes.py
    A ckan/migration/versions/070_cfb544112fa7_add_activity_and_resource_indexes.py
    R ckan/migration/versions/071_add_state_column_to_user_table.py
    A ckan/migration/versions/071_c16f081ef73a_add_state_column_to_user_table.py
    A ckan/migration/versions/072_08dcb9233ad7_add_resource_view.py
    R ckan/migration/versions/072_add_resource_view.py
    A ckan/migration/versions/073_011f51208be3_update_resource_view_resource_id_.py
    R ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    A ckan/migration/versions/074_a4ca55f0f45e_remove_resource_groups.py
    R ckan/migration/versions/074_remove_resource_groups.py
    A ckan/migration/versions/075_9cdc88c8896a_rename_view_plugins.py
    R ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_59995aa965c0_rename_view_plugins_2.py
    R ckan/migration/versions/076_rename_view_plugins_2.py
    A ckan/migration/versions/077_51171a04d86d_add_revisions_to_system_info.py
    R ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_ae821876532a_remove_old_authz_model.py
    R ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_e0177a15d2c9_resource_revision_index.py
    R ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_8224d872c64f_continuity_id_indexes.py
    R ckan/migration/versions/080_continuity_id_indexes.py
    A ckan/migration/versions/081_a64cf4a79182_set_datastore_active.py
    R ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_8ea886d0ede4_create_index_creator_user_id.py
    R ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py
    R ckan/migration/versions/083_remove_related_items.py
    R ckan/migration/versions/084_add_metadata_created.py
    A ckan/migration/versions/084_d85ce5783688_add_metadata_created.py
    R ckan/migration/versions/085_adjust_activity_timestamps.py
    A ckan/migration/versions/085_f9bf3d5c4b4d_adjust_activity_timestamps.py
    A ckan/migration/versions/086_19663581b3bb_drop_openid_column.py
    R ckan/migration/versions/086_drop_openid_column.py
    A ckan/migration/versions/087_ff1b303cab77_remove_old_authorization_tables.py
    R ckan/migration/versions/087_remove_old_authorization_tables.py
    A ckan/migration/versions/088_3537d5420e0e_delete_extrase_which_are_deleted_state.py
    R ckan/migration/versions/088_delete_extras_which_are_deleted_state.py
    A ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py
    R ckan/migration/versions/089_package_activity_migration_check.py
    A ckan/migration/versions/090_980dcd44de4b_delete_migrate_version_table.py
    R ckan/migration/versions/__init__.py
    M ckan/model/__init__.py
    M ckan/model/tag.py
    R ckan/public-bs2/base/css/.gitignore
    R ckan/public-bs2/base/css/fuchsia.css
    R ckan/public-bs2/base/css/green.css
    R ckan/public-bs2/base/css/main.css
    R ckan/public-bs2/base/css/maroon.css
    R ckan/public-bs2/base/css/red.css
    R ckan/public-bs2/base/i18n/.gitignore
    R ckan/public-bs2/base/images/background-tag-ie7.png
    R ckan/public-bs2/base/images/background-tag.png
    R ckan/public-bs2/base/images/background-tile.png
    R ckan/public-bs2/base/images/bg.png
    R ckan/public-bs2/base/images/breadcrumb-slash-ie7.png
    R ckan/public-bs2/base/images/ckan-logo-footer.png
    R ckan/public-bs2/base/images/ckan-logo-white.svg
    R ckan/public-bs2/base/images/ckan-logo.png
    R ckan/public-bs2/base/images/ckan-logo.svg
    R ckan/public-bs2/base/images/ckan.ico
    R ckan/public-bs2/base/images/dashboard-followee-related.png
    R ckan/public-bs2/base/images/dotted.png
    R ckan/public-bs2/base/images/editing.png
    R ckan/public-bs2/base/images/full-width-nav-right.png
    R ckan/public-bs2/base/images/icon-search-27x26.png
    R ckan/public-bs2/base/images/loading-spinner.gif
    R ckan/public-bs2/base/images/nav-active.png
    R ckan/public-bs2/base/images/nav.png
    R ckan/public-bs2/base/images/od_80x15_blue.png
    R ckan/public-bs2/base/images/placeholder-200x125.png
    R ckan/public-bs2/base/images/placeholder-420x220.png
    R ckan/public-bs2/base/images/placeholder-680x400.png
    R ckan/public-bs2/base/images/placeholder-application.png
    R ckan/public-bs2/base/images/placeholder-group.png
    R ckan/public-bs2/base/images/placeholder-image.png
    R ckan/public-bs2/base/images/placeholder-organization.png
    R ckan/public-bs2/base/images/sprite-ckan-icons.png
    R ckan/public-bs2/base/images/sprite-resource-icons.png
    R ckan/public-bs2/base/images/table-seperator.png
    R ckan/public-bs2/base/javascript/client.js
    R ckan/public-bs2/base/javascript/i18n.js
    R ckan/public-bs2/base/javascript/main.js
    R ckan/public-bs2/base/javascript/module.js
    R ckan/public-bs2/base/javascript/modules/activity-stream.js
    R ckan/public-bs2/base/javascript/modules/api-info.js
    R ckan/public-bs2/base/javascript/modules/autocomplete.js
    R ckan/public-bs2/base/javascript/modules/basic-form.js
    R ckan/public-bs2/base/javascript/modules/confirm-action.js
    R ckan/public-bs2/base/javascript/modules/custom-fields.js
    R ckan/public-bs2/base/javascript/modules/dashboard.js
    R ckan/public-bs2/base/javascript/modules/data-viewer.js
    R ckan/public-bs2/base/javascript/modules/dataset-visibility.js
    R ckan/public-bs2/base/javascript/modules/follow.js
    R ckan/public-bs2/base/javascript/modules/followers-counter.js
    R ckan/public-bs2/base/javascript/modules/image-upload.js
    R ckan/public-bs2/base/javascript/modules/media-grid.js
    R ckan/public-bs2/base/javascript/modules/popover-context.js
    R ckan/public-bs2/base/javascript/modules/resource-form.js
    R ckan/public-bs2/base/javascript/modules/resource-reorder.js
    R ckan/public-bs2/base/javascript/modules/resource-upload-field.js
    R ckan/public-bs2/base/javascript/modules/resource-view-embed.js
    R ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    R ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    R ckan/public-bs2/base/javascript/modules/resource-view-reorder.js
    R ckan/public-bs2/base/javascript/modules/select-switch.js
    R ckan/public-bs2/base/javascript/modules/slug-preview.js
    R ckan/public-bs2/base/javascript/modules/table-selectable-rows.js
    R ckan/public-bs2/base/javascript/modules/table-toggle-more.js
    R ckan/public-bs2/base/javascript/notify.js
    R ckan/public-bs2/base/javascript/plugins/jquery.date-helpers.js
    R ckan/public-bs2/base/javascript/plugins/jquery.form-warning.js
    R ckan/public-bs2/base/javascript/plugins/jquery.images-loaded.js
    R ckan/public-bs2/base/javascript/plugins/jquery.inherit.js
    R ckan/public-bs2/base/javascript/plugins/jquery.masonry.js
    R ckan/public-bs2/base/javascript/plugins/jquery.proxy-all.js
    R ckan/public-bs2/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public-bs2/base/javascript/plugins/jquery.slug.js
    R ckan/public-bs2/base/javascript/plugins/jquery.truncator.js
    R ckan/public-bs2/base/javascript/plugins/jquery.url-helpers.js
    R ckan/public-bs2/base/javascript/pubsub.js
    R ckan/public-bs2/base/javascript/resource.config
    R ckan/public-bs2/base/javascript/sandbox.js
    R ckan/public-bs2/base/javascript/tracking.js
    R ckan/public-bs2/base/javascript/view-filters.js
    R ckan/public-bs2/base/less/activity.less
    R ckan/public-bs2/base/less/ckan.less
    R ckan/public-bs2/base/less/custom.less
    R ckan/public-bs2/base/less/dashboard.less
    R ckan/public-bs2/base/less/datapusher.less
    R ckan/public-bs2/base/less/dataset.less
    R ckan/public-bs2/base/less/dropdown.less
    R ckan/public-bs2/base/less/footer.less
    R ckan/public-bs2/base/less/forms.less
    R ckan/public-bs2/base/less/group.less
    R ckan/public-bs2/base/less/homepage.less
    R ckan/public-bs2/base/less/icons.less
    R ckan/public-bs2/base/less/iehacks.less
    R ckan/public-bs2/base/less/layout.less
    R ckan/public-bs2/base/less/main.less
    R ckan/public-bs2/base/less/masthead.less
    R ckan/public-bs2/base/less/media.less
    R ckan/public-bs2/base/less/mixins.less
    R ckan/public-bs2/base/less/module.less
    R ckan/public-bs2/base/less/nav.less
    R ckan/public-bs2/base/less/profile.less
    R ckan/public-bs2/base/less/prose.less
    R ckan/public-bs2/base/less/resource-view.less
    R ckan/public-bs2/base/less/search.less
    R ckan/public-bs2/base/less/tables.less
    R ckan/public-bs2/base/less/toolbar.less
    R ckan/public-bs2/base/less/variables.less
    R ckan/public-bs2/base/test/index.html
    R ckan/public-bs2/base/test/primer/index.html
    R ckan/public-bs2/base/test/spec/ckan.spec.js
    R ckan/public-bs2/base/test/spec/client.spec.js
    R ckan/public-bs2/base/test/spec/i18n.spec.js
    R ckan/public-bs2/base/test/spec/module.spec.js
    R ckan/public-bs2/base/test/spec/modules/autocomplete.spec.js
    R ckan/public-bs2/base/test/spec/modules/basic-form.spec.js
    R ckan/public-bs2/base/test/spec/modules/confirm-action.spec.js
    R ckan/public-bs2/base/test/spec/modules/custom-fields.spec.js
    R ckan/public-bs2/base/test/spec/modules/followers-counter.spec.js
    R ckan/public-bs2/base/test/spec/modules/image-upload.spec.js
    R ckan/public-bs2/base/test/spec/modules/resource-form.spec.js
    R ckan/public-bs2/base/test/spec/modules/resource-upload-field.spec.js
    R ckan/public-bs2/base/test/spec/notify.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.date-helpers.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.form-warning.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.inherit.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.proxy-all.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.js
    R ckan/public-bs2/base/test/spec/pubsub.spec.js
    R ckan/public-bs2/base/test/spec/sandbox.spec.js
    R ckan/public-bs2/base/test/spec/view-filters.spec.js
    R ckan/public-bs2/base/test/vendor/chai.js
    R ckan/public-bs2/base/test/vendor/less.js
    R ckan/public-bs2/base/test/vendor/mocha.css
    R ckan/public-bs2/base/test/vendor/mocha.js
    R ckan/public-bs2/base/test/vendor/sinon.js
    R ckan/public-bs2/base/vendor/bootstrap.js
    R ckan/public-bs2/base/vendor/bootstrap.min.js
    R ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.js
    R ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.min.js
    R ckan/public-bs2/base/vendor/bootstrap/less/accordion.less
    R ckan/public-bs2/base/vendor/bootstrap/less/alerts.less
    R ckan/public-bs2/base/vendor/bootstrap/less/bootstrap.less
    R ckan/public-bs2/base/vendor/bootstrap/less/breadcrumbs.less
    R ckan/public-bs2/base/vendor/bootstrap/less/button-groups.less
    R ckan/public-bs2/base/vendor/bootstrap/less/buttons.less
    R ckan/public-bs2/base/vendor/bootstrap/less/carousel.less
    R ckan/public-bs2/base/vendor/bootstrap/less/close.less
    R ckan/public-bs2/base/vendor/bootstrap/less/code.less
    R ckan/public-bs2/base/vendor/bootstrap/less/component-animations.less
    R ckan/public-bs2/base/vendor/bootstrap/less/dropdowns.less
    R ckan/public-bs2/base/vendor/bootstrap/less/forms.less
    R ckan/public-bs2/base/vendor/bootstrap/less/grid.less
    R ckan/public-bs2/base/vendor/bootstrap/less/hero-unit.less
    R ckan/public-bs2/base/vendor/bootstrap/less/labels-badges.less
    R ckan/public-bs2/base/vendor/bootstrap/less/layouts.less
    R ckan/public-bs2/base/vendor/bootstrap/less/media.less
    R ckan/public-bs2/base/vendor/bootstrap/less/mixins.less
    R ckan/public-bs2/base/vendor/bootstrap/less/modals.less
    R ckan/public-bs2/base/vendor/bootstrap/less/navbar.less
    R ckan/public-bs2/base/vendor/bootstrap/less/navs.less
    R ckan/public-bs2/base/vendor/bootstrap/less/pager.less
    R ckan/public-bs2/base/vendor/bootstrap/less/pagination.less
    R ckan/public-bs2/base/vendor/bootstrap/less/popovers.less
    R ckan/public-bs2/base/vendor/bootstrap/less/progress-bars.less
    R ckan/public-bs2/base/vendor/bootstrap/less/reset.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-1200px-min.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-767px-max.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-768px-979px.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-navbar.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive-utilities.less
    R ckan/public-bs2/base/vendor/bootstrap/less/responsive.less
    R ckan/public-bs2/base/vendor/bootstrap/less/scaffolding.less
    R ckan/public-bs2/base/vendor/bootstrap/less/sprites.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tables.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/buttons.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.css
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/forms-responsive.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/forms.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-static-top.html
    R ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public-bs2/base/vendor/bootstrap/less/thumbnails.less
    R ckan/public-bs2/base/vendor/bootstrap/less/tooltip.less
    R ckan/public-bs2/base/vendor/bootstrap/less/type.less
    R ckan/public-bs2/base/vendor/bootstrap/less/utilities.less
    R ckan/public-bs2/base/vendor/bootstrap/less/variables.less
    R ckan/public-bs2/base/vendor/bootstrap/less/wells.less
    R ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.css
    R ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public-bs2/base/vendor/font-awesome/fonts/FontAwesome.otf
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public-bs2/base/vendor/font-awesome/less/bordered-pulled.less
    R ckan/public-bs2/base/vendor/font-awesome/less/core.less
    R ckan/public-bs2/base/vendor/font-awesome/less/extras.less
    R ckan/public-bs2/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public-bs2/base/vendor/font-awesome/less/font-awesome.less
    R ckan/public-bs2/base/vendor/font-awesome/less/icons.less
    R ckan/public-bs2/base/vendor/font-awesome/less/larger.less
    R ckan/public-bs2/base/vendor/font-awesome/less/list.less
    R ckan/public-bs2/base/vendor/font-awesome/less/mixins.less
    R ckan/public-bs2/base/vendor/font-awesome/less/path.less
    R ckan/public-bs2/base/vendor/font-awesome/less/rotated-flipped.less
    R ckan/public-bs2/base/vendor/font-awesome/less/spinning.less
    R ckan/public-bs2/base/vendor/font-awesome/less/stacked.less
    R ckan/public-bs2/base/vendor/font-awesome/less/variables.less
    R ckan/public-bs2/base/vendor/html5.js
    R ckan/public-bs2/base/vendor/html5.min.js
    R ckan/public-bs2/base/vendor/jed.js
    R ckan/public-bs2/base/vendor/jed.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    R ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    R ckan/public-bs2/base/vendor/jquery.js
    R ckan/public-bs2/base/vendor/jquery.min.js
    R ckan/public-bs2/base/vendor/jquery.ui.core.js
    R ckan/public-bs2/base/vendor/jquery.ui.mouse.js
    R ckan/public-bs2/base/vendor/jquery.ui.sortable.js
    R ckan/public-bs2/base/vendor/jquery.ui.widget.js
    R ckan/public-bs2/base/vendor/moment-with-locales.js
    R ckan/public-bs2/base/vendor/polyfill-object-keys.js
    R ckan/public-bs2/base/vendor/resource.config
    R ckan/public-bs2/base/vendor/select2/.gitignore
    R ckan/public-bs2/base/vendor/select2/CONTRIBUTING.md
    R ckan/public-bs2/base/vendor/select2/LICENSE
    R ckan/public-bs2/base/vendor/select2/README.md
    R ckan/public-bs2/base/vendor/select2/bower.json
    R ckan/public-bs2/base/vendor/select2/component.json
    R ckan/public-bs2/base/vendor/select2/composer.json
    R ckan/public-bs2/base/vendor/select2/package.json
    R ckan/public-bs2/base/vendor/select2/release.sh
    R ckan/public-bs2/base/vendor/select2/select2-bootstrap.css
    R ckan/public-bs2/base/vendor/select2/select2-spinner.gif
    R ckan/public-bs2/base/vendor/select2/select2.css
    R ckan/public-bs2/base/vendor/select2/select2.jquery.json
    R ckan/public-bs2/base/vendor/select2/select2.js
    R ckan/public-bs2/base/vendor/select2/select2.min.js
    R ckan/public-bs2/base/vendor/select2/select2.png
    R ckan/public-bs2/base/vendor/select2/select2_locale_ar.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_az.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_bg.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ca.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_cs.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_da.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_de.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_el.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_en.js.template
    R ckan/public-bs2/base/vendor/select2/select2_locale_es.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_et.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_eu.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fa.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fi.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_fr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_gl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_he.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_hr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_hu.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_id.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_is.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_it.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ja.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ka.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ko.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_lt.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_lv.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_mk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ms.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_nb.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_nl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pt-BR.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_pt-PT.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ro.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_rs.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ru.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_sk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_sv.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_th.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_tr.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_ug-CN.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_uk.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_vi.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_zh-CN.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_zh-TW.js
    R ckan/public-bs2/base/vendor/select2/select2x2.png
    R ckan/templates-bs2/activity_streams/activity_stream_email_notifications.text
    R ckan/templates-bs2/activity_streams/activity_stream_items.html
    R ckan/templates-bs2/admin/base.html
    R ckan/templates-bs2/admin/config.html
    R ckan/templates-bs2/admin/confirm_reset.html
    R ckan/templates-bs2/admin/index.html
    R ckan/templates-bs2/admin/trash.html
    R ckan/templates-bs2/ajax_snippets/custom_fields.html
    R ckan/templates-bs2/ajax_snippets/follow_button.html
    R ckan/templates-bs2/base.html
    R ckan/templates-bs2/dataviewer/base.html
    R ckan/templates-bs2/dataviewer/snippets/data_preview.html
    R ckan/templates-bs2/dataviewer/snippets/no_preview.html
    R ckan/templates-bs2/development/primer.html
    R ckan/templates-bs2/development/snippets/actions.html
    R ckan/templates-bs2/development/snippets/breadcrumb.html
    R ckan/templates-bs2/development/snippets/context.html
    R ckan/templates-bs2/development/snippets/facet.html
    R ckan/templates-bs2/development/snippets/form.html
    R ckan/templates-bs2/development/snippets/form_stages.html
    R ckan/templates-bs2/development/snippets/list.html
    R ckan/templates-bs2/development/snippets/media_grid.html
    R ckan/templates-bs2/development/snippets/module.html
    R ckan/templates-bs2/development/snippets/nav.html
    R ckan/templates-bs2/development/snippets/page_header.html
    R ckan/templates-bs2/development/snippets/pagination.html
    R ckan/templates-bs2/development/snippets/simple-input.html
    R ckan/templates-bs2/emails/invite_user.txt
    R ckan/templates-bs2/emails/invite_user_subject.txt
    R ckan/templates-bs2/emails/reset_password.txt
    R ckan/templates-bs2/emails/reset_password_subject.txt
    R ckan/templates-bs2/error_document_template.html
    R ckan/templates-bs2/footer.html
    R ckan/templates-bs2/group/about.html
    R ckan/templates-bs2/group/activity_stream.html
    R ckan/templates-bs2/group/admins.html
    R ckan/templates-bs2/group/base_form_page.html
    R ckan/templates-bs2/group/confirm_delete.html
    R ckan/templates-bs2/group/confirm_delete_member.html
    R ckan/templates-bs2/group/edit.html
    R ckan/templates-bs2/group/edit_base.html
    R ckan/templates-bs2/group/followers.html
    R ckan/templates-bs2/group/index.html
    R ckan/templates-bs2/group/member_new.html
    R ckan/templates-bs2/group/members.html
    R ckan/templates-bs2/group/new.html
    R ckan/templates-bs2/group/new_group_form.html
    R ckan/templates-bs2/group/read.html
    R ckan/templates-bs2/group/read_base.html
    R ckan/templates-bs2/group/snippets/feeds.html
    R ckan/templates-bs2/group/snippets/group_form.html
    R ckan/templates-bs2/group/snippets/group_item.html
    R ckan/templates-bs2/group/snippets/group_list.html
    R ckan/templates-bs2/group/snippets/helper.html
    R ckan/templates-bs2/group/snippets/info.html
    R ckan/templates-bs2/header.html
    R ckan/templates-bs2/home/about.html
    R ckan/templates-bs2/home/index.html
    R ckan/templates-bs2/home/layout1.html
    R ckan/templates-bs2/home/layout2.html
    R ckan/templates-bs2/home/layout3.html
    R ckan/templates-bs2/home/snippets/about_text.html
    R ckan/templates-bs2/home/snippets/featured_group.html
    R ckan/templates-bs2/home/snippets/featured_organization.html
    R ckan/templates-bs2/home/snippets/promoted.html
    R ckan/templates-bs2/home/snippets/search.html
    R ckan/templates-bs2/home/snippets/stats.html
    R ckan/templates-bs2/macros/autoform.html
    R ckan/templates-bs2/macros/form.html
    R ckan/templates-bs2/organization/about.html
    R ckan/templates-bs2/organization/activity_stream.html
    R ckan/templates-bs2/organization/admins.html
    R ckan/templates-bs2/organization/base_form_page.html
    R ckan/templates-bs2/organization/bulk_process.html
    R ckan/templates-bs2/organization/confirm_delete.html
    R ckan/templates-bs2/organization/confirm_delete_member.html
    R ckan/templates-bs2/organization/edit.html
    R ckan/templates-bs2/organization/edit_base.html
    R ckan/templates-bs2/organization/index.html
    R ckan/templates-bs2/organization/member_new.html
    R ckan/templates-bs2/organization/members.html
    R ckan/templates-bs2/organization/new.html
    R ckan/templates-bs2/organization/new_organization_form.html
    R ckan/templates-bs2/organization/read.html
    R ckan/templates-bs2/organization/read_base.html
    R ckan/templates-bs2/organization/snippets/feeds.html
    R ckan/templates-bs2/organization/snippets/help.html
    R ckan/templates-bs2/organization/snippets/helper.html
    R ckan/templates-bs2/organization/snippets/info.html
    R ckan/templates-bs2/organization/snippets/organization_form.html
    R ckan/templates-bs2/organization/snippets/organization_item.html
    R ckan/templates-bs2/organization/snippets/organization_list.html
    R ckan/templates-bs2/package/activity.html
    R ckan/templates-bs2/package/base.html
    R ckan/templates-bs2/package/base_form_page.html
    R ckan/templates-bs2/package/confirm_delete.html
    R ckan/templates-bs2/package/confirm_delete_resource.html
    R ckan/templates-bs2/package/edit.html
    R ckan/templates-bs2/package/edit_base.html
    R ckan/templates-bs2/package/edit_view.html
    R ckan/templates-bs2/package/followers.html
    R ckan/templates-bs2/package/group_list.html
    R ckan/templates-bs2/package/new.html
    R ckan/templates-bs2/package/new_package_form.html
    R ckan/templates-bs2/package/new_resource.html
    R ckan/templates-bs2/package/new_resource_not_draft.html
    R ckan/templates-bs2/package/new_view.html
    R ckan/templates-bs2/package/read.html
    R ckan/templates-bs2/package/read_base.html
    R ckan/templates-bs2/package/resource_edit.html
    R ckan/templates-bs2/package/resource_edit_base.html
    R ckan/templates-bs2/package/resource_read.html
    R ckan/templates-bs2/package/resource_views.html
    R ckan/templates-bs2/package/resources.html
    R ckan/templates-bs2/package/search.html
    R ckan/templates-bs2/package/snippets/additional_info.html
    R ckan/templates-bs2/package/snippets/cannot_create_package.html
    R ckan/templates-bs2/package/snippets/info.html
    R ckan/templates-bs2/package/snippets/new_package_breadcrumb.html
    R ckan/templates-bs2/package/snippets/package_basic_fields.html
    R ckan/templates-bs2/package/snippets/package_form.html
    R ckan/templates-bs2/package/snippets/package_metadata_fields.html
    R ckan/templates-bs2/package/snippets/resource_edit_form.html
    R ckan/templates-bs2/package/snippets/resource_form.html
    R ckan/templates-bs2/package/snippets/resource_help.html
    R ckan/templates-bs2/package/snippets/resource_info.html
    R ckan/templates-bs2/package/snippets/resource_item.html
    R ckan/templates-bs2/package/snippets/resource_view.html
    R ckan/templates-bs2/package/snippets/resource_view_embed.html
    R ckan/templates-bs2/package/snippets/resource_view_filters.html
    R ckan/templates-bs2/package/snippets/resource_views_list.html
    R ckan/templates-bs2/package/snippets/resource_views_list_item.html
    R ckan/templates-bs2/package/snippets/resources.html
    R ckan/templates-bs2/package/snippets/resources_list.html
    R ckan/templates-bs2/package/snippets/stages.html
    R ckan/templates-bs2/package/snippets/tags.html
    R ckan/templates-bs2/package/snippets/view_form.html
    R ckan/templates-bs2/package/snippets/view_form_filters.html
    R ckan/templates-bs2/package/snippets/view_help.html
    R ckan/templates-bs2/package/view_edit_base.html
    R ckan/templates-bs2/page.html
    R ckan/templates-bs2/revision/__init__.py
    R ckan/templates-bs2/robots.txt
    R ckan/templates-bs2/snippets/activities/added_tag.html
    R ckan/templates-bs2/snippets/activities/changed_group.html
    R ckan/templates-bs2/snippets/activities/changed_organization.html
    R ckan/templates-bs2/snippets/activities/changed_package.html
    R ckan/templates-bs2/snippets/activities/changed_resource.html
    R ckan/templates-bs2/snippets/activities/changed_user.html
    R ckan/templates-bs2/snippets/activities/deleted_group.html
    R ckan/templates-bs2/snippets/activities/deleted_organization.html
    R ckan/templates-bs2/snippets/activities/deleted_package.html
    R ckan/templates-bs2/snippets/activities/deleted_resource.html
    R ckan/templates-bs2/snippets/activities/fallback.html
    R ckan/templates-bs2/snippets/activities/follow_dataset.html
    R ckan/templates-bs2/snippets/activities/follow_group.html
    R ckan/templates-bs2/snippets/activities/follow_user.html
    R ckan/templates-bs2/snippets/activities/new_group.html
    R ckan/templates-bs2/snippets/activities/new_organization.html
    R ckan/templates-bs2/snippets/activities/new_package.html
    R ckan/templates-bs2/snippets/activities/new_resource.html
    R ckan/templates-bs2/snippets/activities/new_user.html
    R ckan/templates-bs2/snippets/activities/removed_tag.html
    R ckan/templates-bs2/snippets/activity_stream.html
    R ckan/templates-bs2/snippets/additional_info.html
    R ckan/templates-bs2/snippets/context.html
    R ckan/templates-bs2/snippets/context/dataset.html
    R ckan/templates-bs2/snippets/context/group.html
    R ckan/templates-bs2/snippets/context/user.html
    R ckan/templates-bs2/snippets/custom_form_fields.html
    R ckan/templates-bs2/snippets/datapreview_embed_dialog.html
    R ckan/templates-bs2/snippets/datapusher_status.html
    R ckan/templates-bs2/snippets/debug.html
    R ckan/templates-bs2/snippets/disqus_trackback.html
    R ckan/templates-bs2/snippets/facet_list.html
    R ckan/templates-bs2/snippets/follow_button.html
    R ckan/templates-bs2/snippets/group.html
    R ckan/templates-bs2/snippets/group_item.html
    R ckan/templates-bs2/snippets/home_breadcrumb_item.html
    R ckan/templates-bs2/snippets/language_selector.html
    R ckan/templates-bs2/snippets/license.html
    R ckan/templates-bs2/snippets/local_friendly_datetime.html
    R ckan/templates-bs2/snippets/organization.html
    R ckan/templates-bs2/snippets/organization_item.html
    R ckan/templates-bs2/snippets/package_grid.html
    R ckan/templates-bs2/snippets/package_item.html
    R ckan/templates-bs2/snippets/package_list.html
    R ckan/templates-bs2/snippets/popular.html
    R ckan/templates-bs2/snippets/private.html
    R ckan/templates-bs2/snippets/search_form.html
    R ckan/templates-bs2/snippets/search_result_text.html
    R ckan/templates-bs2/snippets/simple_search.html
    R ckan/templates-bs2/snippets/social.html
    R ckan/templates-bs2/snippets/sort_by.html
    R ckan/templates-bs2/snippets/subscribe.html
    R ckan/templates-bs2/snippets/tag_list.html
    R ckan/templates-bs2/tag/index.html
    R ckan/templates-bs2/tests/broken_helper_as_attribute.html
    R ckan/templates-bs2/tests/broken_helper_as_item.html
    R ckan/templates-bs2/tests/flash_messages.html
    R ckan/templates-bs2/tests/helper_as_attribute.html
    R ckan/templates-bs2/tests/helper_as_item.html
    R ckan/templates-bs2/tests/mock_json_resource_preview_template.html
    R ckan/templates-bs2/tests/mock_resource_preview_template.html
    R ckan/templates-bs2/user/activity_stream.html
    R ckan/templates-bs2/user/dashboard.html
    R ckan/templates-bs2/user/dashboard_datasets.html
    R ckan/templates-bs2/user/dashboard_groups.html
    R ckan/templates-bs2/user/dashboard_organizations.html
    R ckan/templates-bs2/user/edit.html
    R ckan/templates-bs2/user/edit_base.html
    R ckan/templates-bs2/user/edit_user_form.html
    R ckan/templates-bs2/user/followers.html
    R ckan/templates-bs2/user/list.html
    R ckan/templates-bs2/user/login.html
    R ckan/templates-bs2/user/logout.html
    R ckan/templates-bs2/user/logout_first.html
    R ckan/templates-bs2/user/new.html
    R ckan/templates-bs2/user/new_user_form.html
    R ckan/templates-bs2/user/perform_reset.html
    R ckan/templates-bs2/user/read.html
    R ckan/templates-bs2/user/read_base.html
    R ckan/templates-bs2/user/request_reset.html
    R ckan/templates-bs2/user/snippets/followee_dropdown.html
    R ckan/templates-bs2/user/snippets/followers.html
    R ckan/templates-bs2/user/snippets/login_form.html
    R ckan/templates-bs2/user/snippets/recaptcha.html
    R ckan/templates-bs2/user/snippets/user_search.html
    R ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/model/test_package.py
    M ckan/tests/model/test_package_extra.py
    A ckan/tests/model/test_tags.py
    M ckan/tests/test_coding_standards.py
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into reintroduce-extras_list

Compare: https://github.com/ckan/ckan/compare/1fc1442524eb...b4173af9590f