Download as
Browse Code »

Commit 05bbb3760ce70f5000c3a9fc9e33ef8406775c3b

Authored by Sergio Oliveira
2 parents 3bf00a5f 4a45da22
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Merge branch 'master' of portal.softwarepublico.gov.br:softwarepublico/softwarepublico

Showing 4 changed files with 6 additions and 3 deletions   Show diff stats
config/homologa/config.yaml
  Diff comments   View file @05bbb37
1   -rpm_repository: http://download.opensuse.org/repositories/isv:/spb:/stable/CentOS_7/
  1 +# FIXME point to v4
  2 +rpm_repository: http://download.opensuse.org/repositories/isv:/spb:/devel/CentOS_7/
2 3 admins:
3 4 - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]
4 5 - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]
... ...
config/prod/config.yaml
  Diff comments   View file @05bbb37
1   -rpm_repository: http://download.opensuse.org/repositories/isv:/spb:/stable/CentOS_7/
  1 +# FIXME point to v4
  2 +rpm_repository: http://download.opensuse.org/repositories/isv:/spb:/devel/CentOS_7/
2 3 admins:
3 4 - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]
4 5 - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"]
... ...
cookbooks/noosfero/files/noosfero-create-api-user
  Diff comments   View file @05bbb37
... ... @@ -14,4 +14,4 @@ user = User.create!(
14 14 password_confirmation: password
15 15 )
16 16 user.activate
17   -user.generate_private_token_if_not_exist
  17 +user.generate_private_token!
... ...
cookbooks/noosfero/recipes/default.rb
  Diff comments   View file @05bbb37
... ... @@ -47,6 +47,7 @@ plugins = [
47 47 'statistics',
48 48 'sub_organizations',
49 49 'video',
  50 + 'environment_notification',
50 51 'community_block',
51 52 ]
52 53  
... ...