Download as
Browse Code »

Commit 05bbb3760ce70f5000c3a9fc9e33ef8406775c3b

Authored by Sergio Oliveira
2 parents 3bf00a5f 4a45da22
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, 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 admins: 3 admins:
3 - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"] 4 - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]
4 - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"] 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 admins: 3 admins:
3 - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"] 4 - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"]
4 - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"] 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,4 +14,4 @@ user = User.create!(
14 password_confirmation: password 14 password_confirmation: password
15 ) 15 )
16 user.activate 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,6 +47,7 @@ plugins = [
47 'statistics', 47 'statistics',
48 'sub_organizations', 48 'sub_organizations',
49 'video', 49 'video',
  50 + 'environment_notification',
50 'community_block', 51 'community_block',
51 ] 52 ]
52 53