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

Merge release into master #20113

Merged
merged 30 commits into from
Mar 18, 2021
Merged

Merge release into master #20113

merged 30 commits into from
Mar 18, 2021

Conversation

dsilvam
Copy link
Contributor

@dsilvam dsilvam commented Mar 18, 2021

No description provided.

nollymar and others added 30 commits March 3, 2021 11:25
* Fixing test

* run-all

* Refactoring validations after code review suggestion

* run-all

Co-authored-by: Nollymar Longa <>
* #1992 Rebuild REST High Level Client if Reactor stopped

* #1992 remove not-needed code

* #1992 remove not-needed code

* #19992 Default impl for rebuildClient. Move rebuilding to seperate catch

* #19992 Rebuild client on IllegalState Reactor wrapped and unwrapped

* #19992 null-check

Co-authored-by: Daniel Silva <daniel.silva@dotcms.com>
* #20038 redirect using html form

* #20038 html based redirect
* #19772 Avoid Login when a logout request is sent

* #19772 Add test to the MainSuite
* If folder is newly not show the permission tab

* #19934 Format
* Fix ContentletWebAPIImplIntegrationTest

* replace null with empty string

* Remove extra folder extension

* run-all
* Upgrade saml to 21.03

* upgrade saml to 21.03.1
#20072)

* Change order of Mapping test. Decrease time in other tests. Move IT to Unit

* Attempt removing getting-started-layout by id and name

* Missing changes
* Fixing test

* Fixing test
* Changing the logic to get the Getting Starter portlet layout. Now, it searches by name instead of id

* Updating starter version

Co-authored-by: Nollymar Longa <>
* #20058 turn on security options

* #20098 this sets the mime type to a page if the url is a page in dotCMS
@dsilvam dsilvam merged commit adb9db0 into master Mar 18, 2021
@delete-merged-branch delete-merged-branch bot deleted the merge-release-into-master branch March 18, 2021 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants