2. Changes

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

10 hours ago

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

10 hours ago

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

17 hours ago

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

17 hours ago

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

yesterday

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

yesterday

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

yesterday

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

yesterday

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

2 days ago

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

2 days ago

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

2 days ago

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

2 days ago

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

2 days ago

Failed to create pull request: invalid_token: Token is expired. You can either do re-authorization or token refresh. (-1)

3 days ago

Rebasing (1/7)
error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
 (1)

4 days ago

GitLab: https://git.pleroma.social/pleroma/pleroma, develop 4 days ago

English Japanese (ja_PEDANTIC) 12 characters edited Current translation Translated 4 days ago

English Japanese (ja_PEDANTIC) 5 characters edited Current translation Translated 4 days ago

English Japanese (ja_PEDANTIC) 2 characters edited Current translation Translated 4 days ago

English Japanese (ja_PEDANTIC) 45 characters edited Current translation Translated 4 days ago