Download as
Browse Code »

Commit 764d7b8339d53f49aa472de97eb13e16310dc9fc

Authored by Weblate
2 parents 46efa8df 98bf7a4c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 13 additions and 3 deletions   Show diff stats
lib/tasks/release.rake
  Diff comments   View file @764d7b8
@@ -137,7 +137,17 @@ EOF @@ -137,7 +137,17 @@ EOF
137 new_version += '~rc1' 137 new_version += '~rc1'
138 end 138 end
139 else 139 else
140 - new_version.sub!(/~rc[0-9]+/, '') 140 + if new_version =~ /~rc\d+/
  141 + new_version.sub!(/~rc[0-9]+/, '')
  142 + else
  143 + components = new_version.split('.').map(&:to_i)
  144 + if components.size < 3
  145 + components << 1
  146 + else
  147 + components[-1] += 1
  148 + end
  149 + new_version = components.join('.')
  150 + end
141 end 151 end
142 152
143 puts "Current version: #{$version}" 153 puts "Current version: #{$version}"
public/500.html
  Diff comments   View file @764d7b8
@@ -105,11 +105,11 @@ @@ -105,11 +105,11 @@
105 <div id='pt' style='display: none' class='message'> 105 <div id='pt' style='display: none' class='message'>
106 <h1>Problema temporário no sistema</h1> 106 <h1>Problema temporário no sistema</h1>
107 <p> 107 <p>
108 - Nossa equipe técnica está trabalhando nele, por favor tente mais tarde. Perdoe o incoveniente. 108 + Nossa equipe técnica está trabalhando nele, por favor tente mais tarde. Perdoe o inconveniente.
109 </p> 109 </p>
110 <ul> 110 <ul>
111 <li><a href='javascript: history.back()'>Voltar</a></li> 111 <li><a href='javascript: history.back()'>Voltar</a></li>
112 - <li><a href='/'>Ir para a página inicial do site.</a></li> 112 + <li><a href='/'>Ir para a página inicial do site</a></li>
113 </ul> 113 </ul>
114 </div> 114 </div>
115 115