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.

Sign up for GitHub

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

Jump to bottom

Merge back Release 0.15.4 #658

Merged
merged 35 commits into from
Jul 21, 2021
Merged

Merge back Release 0.15.4 #658

merged 35 commits into from
Jul 21, 2021

Conversation

jnweiger
Copy link
Contributor

@jnweiger jnweiger commented Jul 7, 2021

merge back to master,
closes #605

@jnweiger jnweiger changed the title Release 0.15.3 [DO NOT MERGE YET] Release 0.15.3 Jul 7, 2021
@jnweiger jnweiger changed the title [DO NOT MERGE YET] Release 0.15.3 Merge back Release 0.15.4 Jul 20, 2021
@jnweiger
prepare merge back of branch release-0.15.3 after 0.15.4 was released…
47f986e 
… from this branch.

Sorry for the outdated branch name.
@jnweiger jnweiger requested a review from phil-davis July 20, 2021 18:22
@phil-davis
Copy link
Contributor

phil-davis commented Jul 21, 2021 •
edited
Loading

https://github.com/owncloud/user_ldap/tree/release-0.15.3
"This branch is 25 commits ahead, 12 commits behind master."

There are things in master that are not in this branch. I will look...

  1. PR Only set USER_PREFKEY_FIRSTLOGIN to '1' on first login #652 is not in this branch = not released.
  2. PR [Tests-Only][CI] Update php cs fixer to version 3 #639 - an update of php-cs-fixer (not essential code)
  3. PR [Tests-Only][CI] Update .drone.star file for new changes from activity app #651 - applying the .drone.star changes should make CI up-to-date in this branch

I raised PR #664 to "backport" items 2 and 3 into this branch.

Note: nightly CI on the master branch hung on 2021-07-20 AM https://drone.owncloud.com/owncloud/user_ldap/3348/2/2 - pipelines "sat there" for 22 hours before getting killed. "something happened" with the drone server/agents.

Nighlty CI for 2021-07-21 AM is currently running https://drone.owncloud.com/owncloud/user_ldap/3351 - we should get a result of that soon.

@phil-davis
Copy link
Contributor

https://drone.owncloud.com/owncloud/user_ldap/3359
CONFLICT (content): Merge conflict in lib/User/Manager.php

I will look for what caused that...

This was referenced Jul 21, 2021
Merged
Closed
@phil-davis
Merge pull request #666 from owncloud/backport-pr-652
43e16fa 
[0.15.3 branch] only set USER_PREFKEY_FIRSTLOGIN to '1' on first login
phil-davis
phil-davis approved these changes Jul 21, 2021
View reviewed changes
Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

IMO CI will pass now.

@sonarcloud
Copy link

sonarcloud bot commented Jul 21, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

31.7% 31.7% Coverage
0.0% 0.0% Duplication

@phil-davis
Copy link
Contributor

@micbar CI should pass in an hour or so. The GitHub settings of this repo make it report "This branch is out-of-date with the base branch". Please override and merge if CI is green.

@micbar micbar merged commit 166d59d into master Jul 21, 2021
@delete-merged-branch delete-merged-branch bot deleted the release-0.15.3 branch July 21, 2021 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hurradieweltgehtunter hurradieweltgehtunter hurradieweltgehtunter approved these changes

@micbar micbar micbar approved these changes

@phil-davis phil-davis phil-davis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Release User LDAP 0.15.4
6 participants
@jnweiger @phil-davis @micbar @hurradieweltgehtunter @jvillafanez @dpakach