summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-03-02 03:04:57 +0000
committerGo MAEDA <maeda@farend.jp>2019-03-02 03:04:57 +0000
commit196f7ee83f10eff4ce50a7ea1785d9b0e4ff1be2 (patch)
tree2a1926133eca2d20eee222312c92478ac8481dfe
parent13d9856ba072c530da040e5b06296987d8a45b24 (diff)
downloadredmine-196f7ee83f10eff4ce50a7ea1785d9b0e4ff1be2.tar.gz
redmine-196f7ee83f10eff4ce50a7ea1785d9b0e4ff1be2.zip
Merged r17909 from trunk to 4.0-stable (#30939).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17910 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/admin/plugins.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb
index e1a1b2a64..3d88c90d0 100644
--- a/app/views/admin/plugins.html.erb
+++ b/app/views/admin/plugins.html.erb
@@ -29,7 +29,7 @@ $(document).ready(function(){
dataType: "jsonp",
url: "https://www.redmine.org/plugins/check_updates",
data: <%= raw_json plugin_data_for_updates(@plugins) %>,
- timeout: 3000,
+ timeout: 10000,
beforeSend: function(){
$('#ajax-indicator').show();
},