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

Temp merge test #667

Closed
wants to merge 34 commits into from
Closed

Temp merge test #667

wants to merge 34 commits into from

Conversation

phil-davis
Copy link
Contributor

This is the code from PRs #658 and #666 - I am checking what happens if I try to merge that to master - does GitHub complain about conflicts?

jnweiger and others added 30 commits June 14, 2021 09:39
@jnweiger
prepare release 0.15.3
6ccad6c
@jnweiger
Updated changelog
ffddf01
@hurradieweltgehtunter
Fixes
2781b9e 
fixes #642
fixes #645
fixes  #646
@hurradieweltgehtunter
Fixes #644
06595d8
@hurradieweltgehtunter
hide save indicator initially
b82671d
@jnweiger
manual merge #589
b571ecd
@jnweiger
merge min-version correctly
92e2587
@hurradieweltgehtunter
Update host indicator when config is loaded not on tab change
c660ee6
@hurradieweltgehtunter
Merge branch 'release-0.15.3' of github.com:owncloud/user_ldap into r…
0538738 
…elease-0.15.3
@hurradieweltgehtunter
improve host/port indicator update
04b38a7
@hurradieweltgehtunter
fixes #656
62bae0d
@hurradieweltgehtunter
fixes #653
ce5e3a2
@jnweiger
cherry pick #654
5f34bfd
@jnweiger
prepare merge back to master
b6d16dd
@hurradieweltgehtunter
fix display errors in combination with other apps
43e77fa
@jnweiger
Merge pull request #660 from owncloud/20210707-facelift-fix
c9ae271 
fix display errors in combination with other apps
@jnweiger
Fix display errors in combination with other apps
b17da69
@jnweiger
bump version to 0.15.4
36dbc2c
@hurradieweltgehtunter
fix state indicator
5505c71
@jnweiger
update changelog
67dabb6
@jnweiger
update changelog
259b742
@jvillafanez
Just strip "low" chars, but don't do anything else
86942f3
@jnweiger
Merge pull request #663 from owncloud/fix_password_strip
3bef0cb 
Just strip "low" chars, but don't do anything else
@jnweiger
prepare release 0.15.4-rc3
0e5b79c
@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.
@dpakach @phil-davis
update php-cs-fixer to the latest version
f37b04b
@dpakach @phil-davis
Update .drone.star file to latest version from activity app
aa28dc6
@dpakach @phil-davis
[CI] Update drone.star file to the latest version from activity app
521735c
@phil-davis
write comments.file to /var/www/owncloud in drone
d10d436
@phil-davis
reduce numberOfParts for test pipelines
7c9a697
@phil-davis phil-davis self-assigned this Jul 21, 2021
@phil-davis
Copy link
Contributor Author

No complaints about conflicts - that is good.

@phil-davis phil-davis mentioned this pull request Jul 21, 2021
Merged
@phil-davis
Copy link
Contributor Author

https://drone.owncloud.com/owncloud/user_ldap/3360/83/17
core-apiAll-21-6-master-mysql8.0-php7.2: 1 error occurred: * SerializationError: failed to decode S3 XML error response status code: 404, request id: , host id: caused by: expected element type <Error> but have <html>
There was some transient drone problem - restarting CI...

@sonarqubecloud
Copy link

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 0 Code Smells

31.7% 31.7% Coverage
0.0% 0.0% Duplication

@phil-davis
Copy link
Contributor Author

works - good

@phil-davis phil-davis closed this Jul 21, 2021
@phil-davis phil-davis deleted the temp-merge-test branch July 21, 2021 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@phil-davis phil-davis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@phil-davis @jnweiger @hurradieweltgehtunter @jvillafanez @dpakach