Download as
Browse Code »

Commit f2e167226fd00396748275f7228964ea6329866b

Authored by Antonio Terceiro
2 parents a8798a62 7dd1ad95
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 branch 'stable'

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
public/javascripts/lightbox.js
  Diff comments   View file @f2e1672
@@ -215,7 +215,7 @@ function addLightboxMarkup() { @@ -215,7 +215,7 @@ function addLightboxMarkup() {
215 lb.id = 'lightbox'; 215 lb.id = 'lightbox';
216 lb.className = 'loading'; 216 lb.className = 'loading';
217 lb.innerHTML = '<div id="lbLoadMessage">' + 217 lb.innerHTML = '<div id="lbLoadMessage">' +
218 - '<p>Loading</p>' + 218 + '<img src="/images/loading.gif"/>' +
219 '</div>'; 219 '</div>';
220 bod.appendChild(overlay); 220 bod.appendChild(overlay);
221 bod.appendChild(lb); 221 bod.appendChild(lb);
script/ci-build
  Diff comments   View file @f2e1672
1 #!/bin/sh 1 #!/bin/sh
2 2
  3 +export CUCUMBER_FORMAT=progress
3 cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake 4 cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake