Commit
f2e167226fd00396748275f7228964ea6329866b
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Merge branch 'stable'
|
| @@ -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); |
|
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 |
