diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-07 14:07:38 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-07 14:07:38 +0100 |
| commit | 29416b07ac689be12e2469ebbe3f460300f854fa (patch) | |
| tree | de5cf584b049189b40779079954ee9e0c2b3c8b1 | |
| parent | b9e49ae13a78156f3459b80accb9056d2017c59a (diff) | |
| parent | 06708cc1725c46ba615042bcd5de169d944b2e46 (diff) | |
| download | nextcloud-server-29416b07ac689be12e2469ebbe3f460300f854fa.tar.gz nextcloud-server-29416b07ac689be12e2469ebbe3f460300f854fa.zip | |
Merge pull request #21359 from owncloud/check-changes
remove mention of 'filesystem_check_changes' => 2 from the config sample
| -rw-r--r-- | apps/files_external/js/settings.js | 2 | ||||
| -rw-r--r-- | apps/files_external/tests/js/settingsSpec.js | 4 | ||||
| -rw-r--r-- | config/config.sample.php | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 134db41fc32..59cf55d6ad5 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -27,7 +27,6 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = ' <select id="mountOptionsFilesystemCheck" name="filesystem_check_changes" data-type="int">' + ' <option value="0">{{t "files_external" "Never"}}</option>' + ' <option value="1" selected="selected">{{t "files_external" "Once every direct access"}}</option>' + - ' <option value="2">{{t "files_external" "Every time the filesystem is used"}}</option>' + ' </select>' + ' </div>' + '</div>'; @@ -39,7 +38,6 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = t("files_external", "Check for changes") t("files_external", "Never") t("files_external", "Once every direct access") - t("files_external", "Every time the filesystem is used") */ /** diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js index 3d0168898ca..b6372649fb8 100644 --- a/apps/files_external/tests/js/settingsSpec.js +++ b/apps/files_external/tests/js/settingsSpec.js @@ -254,13 +254,13 @@ describe('OCA.External.Settings tests', function() { // defaults to true var $field = $td.find('.dropdown [name=previews]'); expect($field.prop('checked')).toEqual(true); - $td.find('.dropdown [name=filesystem_check_changes]').val(2); + $td.find('.dropdown [name=filesystem_check_changes]').val(0); $('body').mouseup(); expect(JSON.parse($tr.find('input.mountOptions').val())).toEqual({ encrypt: true, previews: true, - filesystem_check_changes: 2 + filesystem_check_changes: 0 }); }); }); diff --git a/config/config.sample.php b/config/config.sample.php index 6e052d70404..3208a255144 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1063,9 +1063,6 @@ $CONFIG = array( * * 1 -> Check each file or folder at most once per request, recommended for * general use if outside changes might happen. - * - * 2 -> Check every time the filesystem is used, causes a performance hit when - * using external storages, not recommended for regular use. */ 'filesystem_check_changes' => 0, |