bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Alex Gleason 2023-01-01 00:45:05 -06:00
commit fdf4abd10f
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

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

1
CHANGELOG.md
View file

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

2
app/soapbox/components/ui/datepicker/datepicker.tsx
View file

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

2
app/soapbox/components/ui/select/select.tsx
View file

@ -11,7 +11,7 @@ const Select = React.forwardRef<HTMLSelectElement, ISelect>((props, ref) => {
return ( return (
<select <select
ref={ref} 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} {...filteredProps}
> >
{children} {children}