Merge branch 'master' into bilalqamar95/node20-upgrade-3

openedx · Oct 31, 2024 · 5488c67 · 5488c67
2 parents 8f60385 + e5bfc37
commit 5488c67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout

diff --git a/src/components/DateTimeField/index.jsx b/src/components/DateTimeField/index.jsx
@@ -21,7 +21,7 @@ class DateTimeField extends React.Component {
         : getDateWithDashes(this.props.input.value),
       time: (this.props.utcTimeZone
         ? getTimeStringUTC(this.props.input.value)
-        : getTimeString(this.props.input.value)) || '12:00',
+        : getTimeString(this.props.input.value)) || '00:00',
     };
     this.concatDateTime = this.concatDateTime.bind(this);
     this.updateDate = this.updateDate.bind(this);
@@ -121,7 +121,7 @@ class DateTimeField extends React.Component {
             <Form.Control
               name={`${name}Time`}
               type="time"
-              value={time || '12:00'}
+              value={time || '00:00'}
               placeholder="HH:mm"
               required={required}
               disabled={disabled}