Download as
Browse Code »

Commit e1f5af1a890dba1878f45d594d5b8f07a28958d7

Authored by Leandro Santos
2 parents 1d3a66bc 5ae29fcf
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'rails3_AI3033-serpro_integration' of gitlab.com:participa/noosfero… 

… into rails3_AI3033-serpro_integration
Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
plugins/serpro_integration/lib/ext/community.rb
  Diff comments   View file @e1f5af1
@@ -2,9 +2,9 @@ require_dependency 'community' @@ -2,9 +2,9 @@ require_dependency 'community'
2 2
3 class Community 3 class Community
4 4
5 - settings_items :allow_sonar_integration, :type => :boolean, :default => true  
6 - settings_items :allow_gitlab_integration, :type => :boolean, :default => true  
7 - settings_items :allow_jenkins_integration, :type => :boolean, :default => true 5 + settings_items :allow_sonar_integration, :type => :boolean, :default => false
  6 + settings_items :allow_gitlab_integration, :type => :boolean, :default => false
  7 + settings_items :allow_jenkins_integration, :type => :boolean, :default => false
8 8
9 settings_items :serpro_integration_plugin_gitlab, :type => Hash, :default => {} 9 settings_items :serpro_integration_plugin_gitlab, :type => Hash, :default => {}
10 settings_items :serpro_integration_plugin_jenkins, :type => Hash, :default => {} 10 settings_items :serpro_integration_plugin_jenkins, :type => Hash, :default => {}
plugins/serpro_integration/lib/ext/profile.rb
  Diff comments   View file @e1f5af1
1 require_dependency 'profile' 1 require_dependency 'profile'
2 2
3 class Profile 3 class Profile
4 - settings_items :allow_sonar_integration, :type => :boolean, :default => true  
5 - settings_items :allow_gitlab_integration, :type => :boolean, :default => true 4 + settings_items :allow_sonar_integration, :type => :boolean, :default => false
  5 + settings_items :allow_gitlab_integration, :type => :boolean, :default => false
6 6
7 #FIXME make test for default option 7 #FIXME make test for default option
8 settings_items :serpro_integration_plugin, :type => Hash, :default => {} 8 settings_items :serpro_integration_plugin, :type => Hash, :default => {}