Merge branch 'main' into update_firefox_desktop_release

yashikakhurana · web-flow · commit c85408274d34 · 2026-03-26T14:25:33.000-07:00
diff --git a/application-services/application-services.env b/application-services/application-services.env
@@ -1 +1 @@
-APPLICATION_SERVICES_BUILD_ID=151.20260325190717
+APPLICATION_SERVICES_BUILD_ID=151.20260326050237
diff --git a/demo-app/frontend/package-lock.json b/demo-app/frontend/package-lock.json
diff --git a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml
@@ -1,3 +1,3 @@
-beta: cdba8e3e2bae61f7a31e422343594dae21dd7c47
-main: 9d473b47d48f8f9ebdff1a2ea12df50621172321
+beta: c8804305f09dd56622d41f60ba32c546b23f20c4
+main: c836d51da4179d7b456d02d22e2f40c8b1a9b3d7
 release: 70f5597c853f83778fefd286f391842f45e3593e
diff --git a/experimenter/experimenter/features/manifests/fenix/v150.0.0/beta.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v150.0.0/beta.fml.yaml
@@ -23,6 +23,13 @@ features:
         description: Whether or not the feature is available for the user.
         type: Boolean
         default: true
+  app-links:
+    description: Control behavior of app links handling in the browser.
+    variables:
+      show-new-prompt:
+        description: Whether to show the new AppLinksPromptFragment dialog when an app link is detected. If false, the old dialog is used.
+        type: Boolean
+        default: true
   awesomebar-suggestion-provider:
     description: Configuration for the Firefox Suggest awesomebar suggestion provider.
     variables:
diff --git a/experimenter/experimenter/features/manifests/fenix/v150.0.0/developer.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v150.0.0/developer.fml.yaml
@@ -23,6 +23,13 @@ features:
         description: Whether or not the feature is available for the user.
         type: Boolean
         default: true
+  app-links:
+    description: Control behavior of app links handling in the browser.
+    variables:
+      show-new-prompt:
+        description: Whether to show the new AppLinksPromptFragment dialog when an app link is detected. If false, the old dialog is used.
+        type: Boolean
+        default: true
   awesomebar-suggestion-provider:
     description: Configuration for the Firefox Suggest awesomebar suggestion provider.
     variables:
diff --git a/experimenter/experimenter/features/manifests/fenix/v150.0.0/experimenter.yaml b/experimenter/experimenter/features/manifests/fenix/v150.0.0/experimenter.yaml
@@ -18,6 +18,14 @@ app-icon-selection:
     enabled:
       type: boolean
       description: Whether or not the feature is available for the user.
+app-links:
+  description: Control behavior of app links handling in the browser.
+  hasExposure: true
+  exposureDescription: ''
+  variables:
+    show-new-prompt:
+      type: boolean
+      description: Whether to show the new AppLinksPromptFragment dialog when an app link is detected. If false, the old dialog is used.
 awesomebar-suggestion-provider:
   description: Configuration for the Firefox Suggest awesomebar suggestion provider.
   hasExposure: true
diff --git a/experimenter/experimenter/features/manifests/fenix/v150.0.0/nightly.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v150.0.0/nightly.fml.yaml
@@ -23,6 +23,13 @@ features:
         description: Whether or not the feature is available for the user.
         type: Boolean
         default: true
+  app-links:
+    description: Control behavior of app links handling in the browser.
+    variables:
+      show-new-prompt:
+        description: Whether to show the new AppLinksPromptFragment dialog when an app link is detected. If false, the old dialog is used.
+        type: Boolean
+        default: true
   awesomebar-suggestion-provider:
     description: Configuration for the Firefox Suggest awesomebar suggestion provider.
     variables:
diff --git a/experimenter/experimenter/features/manifests/fenix/v150.0.0/release.fml.yaml b/experimenter/experimenter/features/manifests/fenix/v150.0.0/release.fml.yaml
@@ -23,6 +23,13 @@ features:
         description: Whether or not the feature is available for the user.
         type: Boolean
         default: true
+  app-links:
+    description: Control behavior of app links handling in the browser.
+    variables:
+      show-new-prompt:
+        description: Whether to show the new AppLinksPromptFragment dialog when an app link is detected. If false, the old dialog is used.
+        type: Boolean
+        default: false
   awesomebar-suggestion-provider:
     description: Configuration for the Firefox Suggest awesomebar suggestion provider.
     variables:
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml
@@ -1,6 +1,6 @@
-beta: cdba8e3e2bae61f7a31e422343594dae21dd7c47
-esr115: ed946c29f8991922bcf58cf226f7b25bf02a1f17
+beta: c8804305f09dd56622d41f60ba32c546b23f20c4
+esr115: 70e048162f480c527005ea530fd5bd110e4855b4
 esr128: ed38f9209e39bd7ad247c81a7c20c99c874e0a62
-esr140: ae95b8399bf34618db3cb958696f57f27c2d2032
-main: 9d473b47d48f8f9ebdff1a2ea12df50621172321
+esr140: b680455dd9ca898b06685c5b1f4dad11b85592c3
+main: c836d51da4179d7b456d02d22e2f40c8b1a9b3d7
 release: 70f5597c853f83778fefd286f391842f45e3593e
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml
@@ -5541,6 +5541,20 @@ webApps:
       description: >-
         Controls whether web apps can be installed and accessed.
 
+defaultWindowsLaunchOnLogin:
+  description: >-
+    Controls whether or not new Windows users get defaulted to launch on login
+  owner: drubino@mozilla.com
+  hasExposure: true
+  exposureDescription: >-
+    Exposure event is triggered if Windows policy allows launch on login.
+  variables:
+    enabled:
+      type: boolean
+      description: >-
+        If true, and allowed by Windows policy, a new user will be defaulted
+        to have Firefox launched when they log on.
+
 passwordManager:
   description: Password manager related prefs
   owner: maltejur@mozilla.com
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v151.0.0/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/v151.0.0/experimenter.yaml
@@ -5541,6 +5541,20 @@ webApps:
       description: >-
         Controls whether web apps can be installed and accessed.
 
+defaultWindowsLaunchOnLogin:
+  description: >-
+    Controls whether or not new Windows users get defaulted to launch on login
+  owner: drubino@mozilla.com
+  hasExposure: true
+  exposureDescription: >-
+    Exposure event is triggered if Windows policy allows launch on login.
+  variables:
+    enabled:
+      type: boolean
+      description: >-
+        If true, and allowed by Windows policy, a new user will be defaulted
+        to have Firefox launched when they log on.
+
 passwordManager:
   description: Password manager related prefs
   owner: maltejur@mozilla.com
diff --git a/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml b/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml
@@ -83,7 +83,7 @@ firefox-v148.1: 981a01118303b8707b432e1d73040e8fd1c9cf8a
 firefox-v148.2: f1efef1c856662666006ed563686ed39c4e0cade
 firefox-v148.3: 1b5be10df86c50e67cea5cc55d6e9dbe66921da9
 firefox-v149.0: 9db4bd51a49cfef1593cd30d07d314b21cc639a1
-main: 725a4244064070a56c107c45534da2c5380190ae
+main: b3a52dc9fbc5066739a63153167244cbe4f429fd
 release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502
 release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524
 release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b
diff --git a/experimenter/experimenter/features/manifests/ios/beta.fml.yaml b/experimenter/experimenter/features/manifests/ios/beta.fml.yaml
@@ -1106,15 +1106,6 @@ features:
         description: The number of maximum suggestions.
         type: Int
         default: 5
-  web-engine-integration-refactor:
-    description: |
-      The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-    variables:
-      enabled:
-        description: |
-          Enables the feature.
-        type: Boolean
-        default: false
 enums:
   ControlMessageBehavior:
     description: An enum to influence what should be displayed when a control message is selected.
diff --git a/experimenter/experimenter/features/manifests/ios/developer.fml.yaml b/experimenter/experimenter/features/manifests/ios/developer.fml.yaml
@@ -1116,15 +1116,6 @@ features:
         description: The number of maximum suggestions.
         type: Int
         default: 5
-  web-engine-integration-refactor:
-    description: |
-      The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-    variables:
-      enabled:
-        description: |
-          Enables the feature.
-        type: Boolean
-        default: false
 enums:
   ControlMessageBehavior:
     description: An enum to influence what should be displayed when a control message is selected.
diff --git a/experimenter/experimenter/features/manifests/ios/experimenter.yaml b/experimenter/experimenter/features/manifests/ios/experimenter.yaml
@@ -599,13 +599,3 @@ trending-searches-feature:
     max-suggestions:
       type: int
       description: The number of maximum suggestions.
-web-engine-integration-refactor:
-  description: |
-    The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-  hasExposure: true
-  exposureDescription: ''
-  variables:
-    enabled:
-      type: boolean
-      description: |
-        Enables the feature.
diff --git a/experimenter/experimenter/features/manifests/ios/release.fml.yaml b/experimenter/experimenter/features/manifests/ios/release.fml.yaml
@@ -1088,15 +1088,6 @@ features:
         description: The number of maximum suggestions.
         type: Int
         default: 5
-  web-engine-integration-refactor:
-    description: |
-      The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-    variables:
-      enabled:
-        description: |
-          Enables the feature.
-        type: Boolean
-        default: false
 enums:
   ControlMessageBehavior:
     description: An enum to influence what should be displayed when a control message is selected.
diff --git a/experimenter/experimenter/features/manifests/ios/v149.2.0/beta.fml.yaml b/experimenter/experimenter/features/manifests/ios/v149.2.0/beta.fml.yaml
@@ -1106,15 +1106,6 @@ features:
         description: The number of maximum suggestions.
         type: Int
         default: 5
-  web-engine-integration-refactor:
-    description: |
-      The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-    variables:
-      enabled:
-        description: |
-          Enables the feature.
-        type: Boolean
-        default: false
 enums:
   ControlMessageBehavior:
     description: An enum to influence what should be displayed when a control message is selected.
diff --git a/experimenter/experimenter/features/manifests/ios/v149.2.0/developer.fml.yaml b/experimenter/experimenter/features/manifests/ios/v149.2.0/developer.fml.yaml
@@ -1116,15 +1116,6 @@ features:
         description: The number of maximum suggestions.
         type: Int
         default: 5
-  web-engine-integration-refactor:
-    description: |
-      The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-    variables:
-      enabled:
-        description: |
-          Enables the feature.
-        type: Boolean
-        default: false
 enums:
   ControlMessageBehavior:
     description: An enum to influence what should be displayed when a control message is selected.
diff --git a/experimenter/experimenter/features/manifests/ios/v149.2.0/experimenter.yaml b/experimenter/experimenter/features/manifests/ios/v149.2.0/experimenter.yaml
@@ -599,13 +599,3 @@ trending-searches-feature:
     max-suggestions:
       type: int
       description: The number of maximum suggestions.
-web-engine-integration-refactor:
-  description: |
-    The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-  hasExposure: true
-  exposureDescription: ''
-  variables:
-    enabled:
-      type: boolean
-      description: |
-        Enables the feature.
diff --git a/experimenter/experimenter/features/manifests/ios/v149.2.0/release.fml.yaml b/experimenter/experimenter/features/manifests/ios/v149.2.0/release.fml.yaml
@@ -1088,15 +1088,6 @@ features:
         description: The number of maximum suggestions.
         type: Int
         default: 5
-  web-engine-integration-refactor:
-    description: |
-      The feature flag to manage the roll out of the integration of WebEngine into Firefox.
-    variables:
-      enabled:
-        description: |
-          Enables the feature.
-        type: Boolean
-        default: false
 enums:
   ControlMessageBehavior:
     description: An enum to influence what should be displayed when a control message is selected.
diff --git a/experimenter/experimenter/nimbus_ui/constants.py b/experimenter/experimenter/nimbus_ui/constants.py
@@ -206,6 +206,35 @@ class NimbusUIConstants:
         ),
     }
 
+    COMPLETE_EXPERIMENT_ERROR_MESSAGE = """Your experiment is complete, but there were
+    issues computing some results. Contact Experimenter support using the button below
+    for help resolving analysis errors."""
+
+    INCOMPLETE_EXPERIMENT_ERROR_MESSAGE = """Your experiment is still running &mdash;
+    some metrics aren't available yet. This usually affects early results but may
+    indicate a configuration issue; see error details on the right or Contact
+    Experimenter Support using the button below."""
+
+    INVALID_EXPOSURE_DATA_MESSAGE = """Some branches are missing exposure data while
+    others have them. Exposure-based analysis may be incomplete. You can still view
+    available results — try switching the analysis basis to "Exposures" to inspect what's
+    present, or contact Experimenter Support if you need help fixing the data."""
+
+    CONFIG_OVERRIDES_MESSAGE = """The results shown on this page are from an analysis ran
+    with at least one experiment override that affects only the analysis. The original
+    <b>experiment details and description on the Summary page will not reflect this.</b>
+    """
+
+    ENROLLMENT_PHASE_MESSAGE = """Enrollment is when participants can join your
+    experiment. You'll need to end it yourself once enough people have joined, or when
+    the time you set for enrollment has passed — it won't close automatically."""
+
+    OBSERVATION_PHASE_MESSAGE = """Your experiment is officially in progress, and early
+    numbers are starting to come in. These results are just for checking that
+    everything's running correctly — they aren't reliable for decisions until the
+    monitoring period is complete.
+    <a href="https://experimenter.info/workflow/monitoring">Learn more</a>"""
+
     class MetricAreaType:
         PRIMARY = {
             "label": "Primary Metric",
diff --git a/experimenter/experimenter/nimbus_ui/static/css/style.scss b/experimenter/experimenter/nimbus_ui/static/css/style.scss
@@ -331,3 +331,13 @@
     padding-left: 0.75rem !important;
   }
 }
+
+.info-cards-container {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 1rem;
+}
+
+.info-cards-container > *:last-child:nth-child(odd) {
+  grid-column: 1 / -1;
+}
diff --git a/experimenter/experimenter/nimbus_ui/templates/nimbus_experiments/launch_controls_v2.html b/experimenter/experimenter/nimbus_ui/templates/nimbus_experiments/launch_controls_v2.html
diff --git a/experimenter/experimenter/nimbus_ui/templates/nimbus_experiments/results-fragment.html b/experimenter/experimenter/nimbus_ui/templates/nimbus_experiments/results-fragment.html
diff --git a/experimenter/experimenter/targeting/constants.py b/experimenter/experimenter/targeting/constants.py
diff --git a/experimenter/tests/firefox_desktop_beta_build.env b/experimenter/tests/firefox_desktop_beta_build.env
diff --git a/experimenter/tests/firefox_fennec_release_build.env b/experimenter/tests/firefox_fennec_release_build.env
diff --git a/experimenter/tests/poetry.lock b/experimenter/tests/poetry.lock
diff --git a/experimenter/tests/pyproject.toml b/experimenter/tests/pyproject.toml
diff --git a/experimenter/yarn.lock b/experimenter/yarn.lock
diff --git a/schemas/poetry.lock b/schemas/poetry.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-APPLICATION_SERVICES_BUILD_ID=151.20260325190717`
	`1`	`+APPLICATION_SERVICES_BUILD_ID=151.20260326050237`