Merge remote-tracking branch 'origin/develop' into renovate/blurhash-2.x

.gitlab-ci.yml

@@ -36,8 +36,8 @@ danger:
     - export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
     - npx danger ci
   except:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
   allow_failure: true
 
 lint-js:
@@ -115,8 +115,8 @@ docs-deploy:
   script:
     - curl -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' https://gitlab.com/api/v4/projects/15685485/trigger/pipeline
   only:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
     changes:
       - "docs/**/*"
 
@@ -141,8 +141,8 @@ pages:
     paths:
     - public
   only:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 
 docker:
   stage: deploy
@@ -157,8 +157,8 @@ docker:
     - docker build -t $CI_REGISTRY_IMAGE .
     - docker push $CI_REGISTRY_IMAGE
   only:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 
 include:
   - template: Jobs/Dependency-Scanning.gitlab-ci.yml

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Layout: use accent color for "floating action button" (mobile compose button).
 - ServiceWorker: don't serve favicon, robots.txt, and others from ServiceWorker.
+- Datepicker: correctly default to the current year.
 
 ## [3.0.0] - 2022-12-25
 

app/soapbox/components/ui/datepicker/datepicker.tsx

@@ -20,7 +20,7 @@ const Datepicker = ({ onChange }: IDatepicker) => {
 
   const [month, setMonth] = useState<number>(new Date().getMonth());
   const [day, setDay] = useState<number>(new Date().getDate());
-  const [year, setYear] = useState<number>(2022);
+  const [year, setYear] = useState<number>(new Date().getFullYear());
 
   const numberOfDays = useMemo(() => {
     return getDaysInMonth(month, year);

app/soapbox/components/ui/select/select.tsx

@@ -11,7 +11,7 @@ const Select = React.forwardRef<HTMLSelectElement, ISelect>((props, ref) => {
   return (
     <select
       ref={ref}
-      className={`w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-800 focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-900 dark:text-gray-100 dark:ring-1 dark:ring-gray-800 dark:focus:ring-primary-500 dark:focus:border-primary-500 sm:text-sm rounded-md disabled:opacity-50 ${className}`}
+      className={`w-full pl-3 pr-10 py-2 text-base truncate border-gray-300 dark:border-gray-800 focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-900 dark:text-gray-100 dark:ring-1 dark:ring-gray-800 dark:focus:ring-primary-500 dark:focus:border-primary-500 sm:text-sm rounded-md disabled:opacity-50 ${className}`}
       {...filteredProps}
     >
       {children}