Download as
Browse Code »

Commit fd9e479a2c9620feb665db5068ca07a88f45295c

Authored by Victor Costa
2 parents 12ccc727 22b0889f
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 'master' into stable

Showing 4 changed files with 4 additions and 4 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @fd9e479
@@ -1380,7 +1380,7 @@ module ApplicationHelper @@ -1380,7 +1380,7 @@ module ApplicationHelper
1380 # are old things that do not support it we are keeping this hot spot. 1380 # are old things that do not support it we are keeping this hot spot.
1381 html = @plugins.pipeline(:parse_content, html, source).first 1381 html = @plugins.pipeline(:parse_content, html, source).first
1382 end 1382 end
1383 - html 1383 + html.html_safe
1384 end 1384 end
1385 1385
1386 def convert_macro(html, source) 1386 def convert_macro(html, source)
app/views/profile/_profile_scrap_reply_form.html.erb
  Diff comments   View file @fd9e479
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 :title => _('Leave your comment'), 11 :title => _('Leave your comment'),
12 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?), 12 :onfocus => ("if(this.value==this.title){this.value='';this.style.color='#000'};this.style.backgroundImage='url(" + profile_icon(current_person, :icon, false) + ")'" if logged_in?),
13 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?), 13 :onblur => ("if(this.value==''){this.value=this.title;this.style.color='#ccc'};this.style.backgroundImage='none'" if logged_in?),
14 - :value => _('Leave your comment'), %> 14 + :value => _('Leave your comment') %>
15 <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %> 15 <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
16 <%= hidden_field_tag 'receiver_id', scrap.sender.id %> 16 <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
17 <% end %> 17 <% end %>
lib/tasks/ci.rake
  Diff comments   View file @fd9e479
@@ -7,7 +7,7 @@ namespace :ci do @@ -7,7 +7,7 @@ namespace :ci do
7 from = ENV['PREV_HEAD'] || "origin/#{current_branch}" 7 from = ENV['PREV_HEAD'] || "origin/#{current_branch}"
8 to = ENV['HEAD'] || current_branch 8 to = ENV['HEAD'] || current_branch
9 changed_files = `git diff --name-only #{from}..#{to}`.split.select do |f| 9 changed_files = `git diff --name-only #{from}..#{to}`.split.select do |f|
10 - File.exist?(f) 10 + File.exist?(f) && f.split(File::SEPARATOR).first != 'vendor'
11 end 11 end
12 12
13 changed_plugin_files = changed_files.select do |f| 13 changed_plugin_files = changed_files.select do |f|
script/quick-start
  Diff comments   View file @fd9e479
@@ -109,7 +109,7 @@ run &#39;rake noosfero:translations:compile &gt;/dev/null 2&gt;&amp;1&#39; @@ -109,7 +109,7 @@ run &#39;rake noosfero:translations:compile &gt;/dev/null 2&gt;&amp;1&#39;
109 mkdir -p tmp/pids 109 mkdir -p tmp/pids
110 110
111 # use default gitignore rules 111 # use default gitignore rules
112 -ln -s gitignore.example .gitignore 112 +ln -s gitignore.example .gitignore || true
113 113
114 # you can now start the server 114 # you can now start the server
115 say "I: Congratulations, you are ready to run Noosfero." 115 say "I: Congratulations, you are ready to run Noosfero."