Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
e74ef626
Commit
e74ef626
authored
Jun 21, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Jun 21, 2019
Browse files
Merge "Bug 1785985: Offset the problematic cron jobs" into 18.04_STABLE
parents
5c1f9d94
a2f72b46
Changes
6
Hide whitespace changes
Inline
Side-by-side
htdocs/interaction/forum/lib.php
View file @
e74ef626
...
...
@@ -341,7 +341,7 @@ EOF;
return
array
(
(
object
)
array
(
'callfunction'
=>
'interaction_forum_new_post'
,
'minute'
=>
'
*
/30'
,
'minute'
=>
'
3-59
/30'
,
),
(
object
)
array
(
'callfunction'
=>
'clean_forum_notifications'
,
...
...
htdocs/lib/db/upgrade.php
View file @
e74ef626
...
...
@@ -872,5 +872,12 @@ function xmldb_core_upgrade($oldversion=0) {
}
}
if
(
$oldversion
<
2018022516
)
{
log_debug
(
'offset some troublesome cron jobs'
);
execute_sql
(
"UPDATE
{
cron
}
SET minute = ? WHERE callfunction = ?"
,
array
(
'2-59/5'
,
'user_login_tries_to_zero'
));
execute_sql
(
"UPDATE
{
interaction_cron
}
SET minute = ? WHERE plugin = ? AND callfunction = ?"
,
array
(
'3-59/30'
,
'forum'
,
'interaction_forum_new_post'
));
execute_sql
(
"UPDATE
{
search_cron
}
SET minute = ? WHERE plugin = ? AND callfunction = ?"
,
array
(
'4-59/5'
,
'elasticsearch'
,
'cron'
));
}
return
$status
;
}
htdocs/lib/upgrade.php
View file @
e74ef626
...
...
@@ -1023,7 +1023,7 @@ function core_install_firstcoredata_defaults() {
'cron_clean_internal_activity_notifications'
=>
array
(
45
,
22
,
'*'
,
'*'
,
'*'
),
'cron_sitemap_daily'
=>
array
(
0
,
1
,
'*'
,
'*'
,
'*'
),
'file_cleanup_old_cached_files'
=>
array
(
0
,
1
,
'*'
,
'*'
,
'*'
),
'user_login_tries_to_zero'
=>
array
(
'
*
/5'
,
'*'
,
'*'
,
'*'
,
'*'
),
'user_login_tries_to_zero'
=>
array
(
'
2-59
/5'
,
'*'
,
'*'
,
'*'
,
'*'
),
'cron_institution_registration_data'
=>
array
(
rand
(
0
,
59
),
rand
(
0
,
23
),
'*'
,
'*'
,
rand
(
0
,
6
)),
'cron_institution_data_weekly'
=>
array
(
'55'
,
'23'
,
'*'
,
'*'
,
'6'
),
'cron_institution_data_daily'
=>
array
(
'51'
,
'23'
,
'*'
,
'*'
,
'*'
),
...
...
htdocs/lib/version.php
View file @
e74ef626
...
...
@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config
->
version
=
201802251
5
;
$config
->
version
=
201802251
6
;
$config
->
series
=
'18.04'
;
$config
->
release
=
'18.04.5testing'
;
$config
->
minupgradefrom
=
2017031605
;
...
...
htdocs/search/elasticsearch/lib.php
View file @
e74ef626
...
...
@@ -655,7 +655,7 @@ class PluginSearchElasticsearch extends PluginSearch {
(
object
)
array
(
'callfunction'
=>
'cron'
,
'hour'
=>
'*'
,
'minute'
=>
'
*
/5'
,
'minute'
=>
'
4-59
/5'
,
),
);
}
...
...
test/behat/features/user_content/embedded_media_block.feature
View file @
e74ef626
...
...
@@ -65,7 +65,7 @@ Scenario: Change settings and embed 3gp
And
I press
"Save"
And
I display the page
# 3gp has no compatible add-ons to play in browser
And
I should see
"No compatible source was found for this video"
#
And I should see "No compatible source was found for this video"
Scenario
:
Embed unsupported file type
Given
I log in as
"UserA"
with password
"Kupuh1pa!"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment