Bug 1463846 - Switch enterprise only policies to be machine on Windows: fix conflicts. a=browser-chrome-fix
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 06 Aug 2018 20:25:13 +0300
changeset 480778 476aa14b33e32c344756376c78eca6f4e3d32a4f
parent 480777 42533e38035088b7259618ada072fc1c8cb0b133
child 480779 de436be5e56eced99d5a2c8c06fd401a1c74cb3a
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbrowser-chrome-fix
bugs1463846
milestone62.0
Bug 1463846 - Switch enterprise only policies to be machine on Windows: fix conflicts. a=browser-chrome-fix
browser/components/enterprisepolicies/schemas/policies-schema.json
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -287,22 +287,18 @@
       "first_available": "60.0",
       "machine_only": true,
 
       "type": "boolean"
     },
 
     "DisableTelemetry": {
       "description": "Turns off telemetry.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": true,
-=======
       "machine_only": true,
->>>>>>> graft
 
       "type": "boolean"
     },
 
     "DisplayBookmarksToolbar": {
       "description": "Causes the bookmarks toolbar to be displayed by default.",
       "first_available": "60.0",
 
@@ -336,22 +332,18 @@
           "type": "boolean"
         }
       },
       "required": ["Value"]
     },
 
     "Extensions": {
       "description": "Install, uninstall or lock extensions. The Install option takes URLs or paths as parameters. The Uninstall and Locked options take extension IDs.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": true,
-=======
       "machine_only": true,
->>>>>>> graft
 
       "type": "object",
       "properties": {
         "Install" : {
           "type": "array",
           "items": {
             "type": "string"
           }
@@ -405,22 +397,18 @@
       "description": "If false, prevents ability to turn on hardware acceleration.",
       "first_available": "60.0",
 
       "type": "boolean"
     },
 
     "Homepage": {
       "description": "Set and optionally lock the homepage.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": true,
-=======
       "machine_only": true,
->>>>>>> graft
 
       "type": "object",
       "properties": {
         "URL": {
           "type": "URL"
         },
         "Locked": {
           "type": "boolean"
@@ -464,34 +452,26 @@
       "description": "Enforces the setting to allow Firefox to offer to remember saved logins and passwords. Both true and false values are accepted.",
       "first_available": "60.0",
 
       "type": "boolean"
     },
 
     "OverrideFirstRunPage": {
       "description": "Override the first run page. Set this policy to blank if you want to disable the first run page.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": true,
-=======
       "machine_only": true,
->>>>>>> graft
 
       "type": "URLorEmpty"
     },
 
     "OverridePostUpdatePage": {
       "description": "Override the post-update \"What's New\" page. Set this policy to blank if you want to disable the post-update page.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": true,
-=======
       "machine_only": true,
->>>>>>> graft
 
       "type": "URLorEmpty"
     },
 
     "Permissions": {
       "description": "Configure permissions for camera, microphone, location and notifications.",
       "first_available": "60.0",
 
@@ -692,21 +672,17 @@
       "description": "Clears ALL browser data on shutdown.",
       "first_available": "60.0",
 
       "type": "boolean"
     },
 
     "SearchBar": {
       "description": "Sets the default location of the search bar. Only applies on firtrun, but can be changed.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": true,
-=======
->>>>>>> graft
 
       "type": "string",
       "enum": ["unified", "separate"]
     },
 
     "SearchEngines": {
       "description": "Modifies the list of search engines built into Firefox",
       "first_available": "60.0",
@@ -758,22 +734,18 @@
             "type": "string"
           }
         }
       }
     },
 
     "WebsiteFilter": {
       "description": "Blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. The arrays are limited to 1000 entries each.",
-<<<<<<< local
       "first_available": "60.0",
-      "enterprise_only": "true",
-=======
       "machine_only": "true",
->>>>>>> graft
 
       "type": "object",
       "properties": {
         "Block": {
           "type": "array",
           "items": {
             "type": "string"
           }