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 master into develop & Set version to 0.67.0-develop #11348

Merged
merged 10 commits into from
Jul 5, 2018

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Jul 4, 2018

No description provided.

sampaiodiego and others added 10 commits July 4, 2018 14:22
…ptout (#11254)

Closes #11198 

- [x] Show all steps on info box
- [x] Properly display errors in registration process of admin user
- [x] Break steps in subtemplates
- [x] Redesign "Register Server" step
      ![Register Server](https://user-images.githubusercontent.com/2263066/42013253-cd691bc2-7a72-11e8-8832-fe9ccd9e89b4.png)
- [x] Update end-to-end tests
…#11333)

When the integrations has a script that access some kind of async (made sync by Fibers) method the VM timeout would be fired after the timeout time and would generate some zoombie fibers cousing the oplog tailing (that uses Fibers) to stop working util a cursor timeout.
# Conflicts:
#	.docker/Dockerfile.rhel
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
@rodrigok rodrigok merged commit 7c9fe1e into develop Jul 5, 2018
@rodrigok rodrigok deleted the develop-sync branch July 5, 2018 12:34
@sampaiodiego sampaiodiego mentioned this pull request Jul 20, 2018
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.

6 participants