Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/office files lock newly created. Plus refactoring. #6613

Merged
merged 1 commit into from
Apr 13, 2024

Conversation

allexzander
Copy link
Contributor

No description provided.

@allexzander allexzander force-pushed the feature/office-files-lock-newly-created branch from 65823eb to a133669 Compare April 6, 2024 12:54
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/gui/folderwatcher.h Outdated Show resolved Hide resolved
@allexzander allexzander force-pushed the feature/office-files-lock-newly-created branch from a133669 to f57f847 Compare April 6, 2024 13:08
@github-actions github-actions bot dismissed their stale review April 6, 2024 13:15

No Clang-Tidy warnings found so I assume my comments were addressed

Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

seems like I cannot get it to work
image

@allexzander allexzander requested a review from mgallien April 11, 2024 22:45
@allexzander
Copy link
Contributor Author

@mgallien Should be fixed now, kindly test with new build.

Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

works

@allexzander allexzander force-pushed the feature/office-files-lock-newly-created branch from 47fe39a to 686e6d8 Compare April 13, 2024 13:40
@allexzander allexzander force-pushed the feature/office-files-lock-newly-created branch from 686e6d8 to dbde9e3 Compare April 13, 2024 13:46
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6613-dbde9e3a2b3efab1c0902c0516207e9d21489f76-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@allexzander allexzander merged commit adc7a22 into master Apr 13, 2024
10 of 12 checks passed
@allexzander allexzander deleted the feature/office-files-lock-newly-created branch April 13, 2024 13:58
@allexzander
Copy link
Contributor Author

/backport to stable-3.13

@allexzander
Copy link
Contributor Author

/backport to stable-3.12

@nextcloud nextcloud deleted a comment from backportbot bot Apr 13, 2024
Copy link

backportbot bot commented Apr 13, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6613/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick dbde9e3a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6613/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
18 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@mgallien mgallien added this to the 3.14.0 milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants