Skip to content

Merge https://github.com/filebrowser/filebrowser:master (dd53644) into oadp-1.6#12

Merged
openshift-merge-bot[bot] merged 18 commits into
migtools:oadp-1.6from
oadp-rebasebot:rebase-bot-oadp-1.6
Apr 14, 2026
Merged

Merge https://github.com/filebrowser/filebrowser:master (dd53644) into oadp-1.6#12
openshift-merge-bot[bot] merged 18 commits into
migtools:oadp-1.6from
oadp-rebasebot:rebase-bot-oadp-1.6

Conversation

@oadp-rebasebot-app
Copy link
Copy Markdown

@oadp-rebasebot-app oadp-rebasebot-app Bot commented Apr 14, 2026

No description provided.

renovate Bot and others added 17 commits April 11, 2026 07:43
@renovate
chore(deps): update pnpm/action-setup action to v6 (filebrowser#5898)
871f337 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Brumaire
fix(preview): let arrow keys seek video instead of switching files (f…
0fadf28 
…ilebrowser#5895)
@hacdias
docs: update PR template
23e84c9
@transifex-integration
chore: pull translations (filebrowser#5871)
0321415 
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
@renovate
chore(deps): update all non-major dependencies (filebrowser#5870)
9b80a9a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@hacdias
chore(release): 2.63.2
dd53644
@oadp-maintainers
merge upstream/master into oadp-1.6
2c5ceaf
@mpryc @oadp-maintainers
UPSTREAM: <carry> Add disableUserProfile branding option
f1d8858 
New config option:
  --branding.disableUserProfile

This option allows to disable User Profile together
with User settings.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Add defaultLoginUser branding option
c4213f5 
New config option:
  --branding.defaultLoginUser "username"

This option allows to provide default Username, which will result
in hiding username field from the welcome page.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Disable delete and rename from Help
b5f8905 
Removes Help options "Delete" and "Rename" if the
following permissions are revoked from a particular
user:

  --perm.delete=false
  --perm.rename=false

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Containerfile to be used with UBI
383068a 
Add multi-stage Containerfile for UBI-based builds.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Add OWNERS file
91f777f 
Adds OWNERS file.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc @oadp-maintainers
UPSTREAM: <carry> Fix broken rebase of branding options
32843f6 
Fix downstream changes to match upstream refactored functions.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@weshayutin @oadp-maintainers
first pass at a konflux dockerfile
59af2d2 
Signed-off-by: Wesley Hayutin <weshayutin@gmail.com>
@mpryc @claude @oadp-maintainers
UPSTREAM: <carry>: Add package-lock.json for Konflux hermetic builds
a084690 
Hermeto/Cachi2 requires package-lock.json (or npm-shrinkwrap.json) for
npm dependency pre-fetching during hermetic Konflux builds. pnpm-lock.yaml
is not supported by Hermeto's npm handler.

Generated via: npm install --package-lock-only
Lockfile version: 3

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@mpryc @claude @oadp-maintainers
Use npm instead of pnpm for hermetic Konflux builds
e2b5f61 
In hermetic Konflux/Cachi2 builds, network access is blocked, causing
`npm install -g pnpm` to fail with ENOTFOUND when trying to reach
registry.npmjs.org.

Replace pnpm with npm clean-install, consistent with how mta-ui and
mta-static-report handle npm dependencies in hermetic builds.
package-lock.json is already present in the frontend/ directory.

Changes:
- Remove pnpm install, use npm clean-install --ignore-scripts --no-audit --verbose
- Replace pnpm run build with npm run typecheck && npx vite build
  (the package.json build script references pnpm internally)
- Remove go mod download, Cachi2 pre-fetches Go modules and makes
  them available via cachi2.env GOMODCACHE
- Consolidate LABEL instructions into single multi-line block
- Fix extra space in io.k8s.description label

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@mpryc @claude @oadp-maintainers
Regenerate package-lock.json with Node.js 24 / npm 11
b5f4bd0 
The previous package-lock.json was out of sync with package.json after
rebase, causing version mismatches (e.g. vite@7.3.2 vs ^8.0.0) and
preventing Cachi2 from properly pre-fetching npm dependencies.

Regenerated using registry.access.redhat.com/ubi9/nodejs-24:latest
(Node.js v24.13.0, npm 11.6.2) to match the builder image.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci openshift-ci Bot requested review from mpryc and weshayutin April 14, 2026 09:37
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 14, 2026

Hi @oadp-rebasebot-app[bot]. Thanks for your PR.

I'm waiting for a migtools member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 14, 2026 •
edited
Loading

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Merge https://github.com/filebrowser/filebrowser:master (dd53644) into oadp-1.6". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

@mpryc
Copy link
Copy Markdown

mpryc commented Apr 14, 2026

/ok-to-test

@mpryc
Copy link
Copy Markdown

mpryc commented Apr 14, 2026

/lgtm

@mpryc
Copy link
Copy Markdown

mpryc commented Apr 14, 2026

/approve

@openshift-ci openshift-ci Bot removed the lgtm label Apr 14, 2026
@mpryc
UPSTREAM: <carry>: fix github actions
71c1c28 
Disable Validate Title check (semantic commit PR titles are
not used downstream). Fix Go version to 1.25 and add oadp-*
branches to CI triggers.
@mpryc mpryc force-pushed the rebase-bot-oadp-1.6 branch from fe35816 to 71c1c28 Compare April 14, 2026 10:33
@mpryc
Copy link
Copy Markdown

mpryc commented Apr 14, 2026

/override "Validate Title"

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 14, 2026

@mpryc: Overrode contexts on behalf of mpryc: Validate Title

Details

In response to this:

/override "Validate Title"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

mpryc
mpryc reviewed Apr 14, 2026
View reviewed changes
Copy link
Copy Markdown

@mpryc mpryc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Apr 14, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 14, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mpryc, oadp-rebasebot-app[bot]

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit 1d33dd8 into migtools:oadp-1.6 Apr 14, 2026
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mpryc mpryc mpryc approved these changes

@weshayutin weshayutin Awaiting requested review from weshayutin

Assignees

@mpryc mpryc

Labels

approved lgtm ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mpryc @Brumaire @hacdias @oadp-maintainers @weshayutin