Skip to content

[HOTFIX] [PROD] Post-release 2.4.15.2 #3350

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
Merged
vikasrohit merged 29 commits into from
Oct 14, 2019
Merged

[HOTFIX] [PROD] Post-release 2.4.15.2 #3350

vikasrohit merged 29 commits into from
Oct 14, 2019

Conversation

@maxceem
Copy link
Collaborator

@maxceem maxceem commented Oct 2, 2019 •
edited
Loading

This PR will contain the post-release fixes part 2. I think we can wait at least a day before merging it while collecting fixes.

The list of fixes (updated):

rashmi73 and others added 16 commits September 19, 2019 23:25
@rashmi73
Update ProjectManagementDialog.js
7742bb2
@suppermancool
Update Invited Registered User Workflow #3311
d4eb738 
Update Invited Registered User Workflow #3311
@suppermancool
add new action for invite fail
d6dd5be 
add new action for invite fail
@rashmi73
Merge pull request #11 from appirio-tech/cf19
c6e0ef9 
Cf19
@rashmi73
Update utils.js
b6dd945
@rashmi73
issue 3155 minor fix
0173341
@suppermancool
fix feedback
27fc730 
fix feedback
@suppermancool
Merge branch 'cf19' into issue-3311
b09f940
@suppermancool
remove promise for invite fail
56f8317 
remove promise for invite fail
@suppermancool
fix case where the request to accept/decline invitation fails on the …
c70f527 
…server.
@suppermancool
Revert "fix case where the request to accept/decline invitation fails…
0a4704a 
… on the server."

This reverts commit c70f527.
@suppermancool
fix
89a4796 
fix
@suppermancool
fix show error message for invite fail
badf573 
fix show error message for invite fail
@rashmi73
issue 3155 minor fix
9014c8d
@maxceem
Merge pull request #3335 from suppermancool/issue-3311
6d74631 
Update Invited Registered User Workflow #3311
@maxceem
fix: show standard error message on project details page
bb360a2 
In the PR #3335 the code was updated to show error details on the error page. But we have to show the standard error message.
Also, we have to show error 404 in case of error 403 because server throws error 403 if page is not found.

ref issue #3311
@maxceem maxceem changed the base branch from dev to master October 2, 2019 07:03
@vikasrohit
Copy link

vikasrohit commented Oct 3, 2019

@maxceem if we are able to get pending fix by EOD, we can push this hotfix to prod today, otherwise I would like to wait for next week as tomorrow is Friday and I don't wan to cause any disruption to the services on weekends.

@maxceem
Copy link
Collaborator Author

maxceem commented Oct 3, 2019

@maxceem if we are able to get pending fix by EOD.

I think we will hardly get it by the EOD. But if we do, I'll let you know asap.

otherwise I would like to wait for next week as tomorrow is Friday and I don't wan to cause any disruption to the services on weekends.

Totally agree.

@suppermancool
#3310 Update Invited Unregistered 'Join Project' Workflow
25c7a7d 
#3310 Update Invited Unregistered 'Join Project' Workflow
@suppermancool
add code to handle some edge case and fix ui problem
2ac8b7d 
add code to handle some edge case and fix ui problem
@suppermancool
update project search list manually after user accept/refuse invite
332c6d2 
update project search list manually after user accept/refuse invite
@suppermancool
remove test
bfce588 
remove test
@vikasrohit
Copy link

vikasrohit commented Oct 9, 2019

@maxceem are we ready now for merging this PR to master?

@maxceem
Copy link
Collaborator Author

maxceem commented Oct 9, 2019

@vikasrohit not yet. I'm waiting for the final fixes for this PR #3356 which want to merge in this patch.

suppermancool and others added 2 commits October 9, 2019 14:28
@suppermancool
update data of member after agree invite
4b8d445 
update data of member after agree invite
@maxceem
Merge pull request #3356 from suppermancool/issue-3310
ff7733d 
#3310 Update Invited Unregistered 'Join Project' Workflow
@maxceem
Merge branch 'cf19' into hotfix/post-release-2.4.15.2
de90e5d 
# Conflicts:
#	src/config/constants.js
#	src/projects/actions/projectMember.js
@maxceem
fix: edge case fixes for Join/Decline buttons
50edf8a 
ref issue #3310
@maxceem maxceem requested a review from vikasrohit October 10, 2019 04:49
@maxceem
Copy link
Collaborator Author

maxceem commented Oct 10, 2019

@vikasrohit This PR is ready for deploying. It would be best if we deploy corresponding patch to DEV first for the staging testing.

@vikasrohit
Copy link

vikasrohit commented Oct 11, 2019

@maxceem as now we have this hotfix in dev, do you think it is stable to be released? I would not like to push it today as it is weekend now. So, I would schedule this patch release for Monday, if all things works as expected for us.

@maxceem
Copy link
Collaborator Author

maxceem commented Oct 14, 2019 •
edited
Loading

@vikasrohit, I've tested on DEV. All works good for release.

@vikasrohit vikasrohit merged commit 7a06d3f into master Oct 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@vikasrohit vikasrohit vikasrohit approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@maxceem @vikasrohit @rashmi73 @suppermancool