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 and test patch from QCIF #21

Closed
nickdos opened this issue Sep 7, 2020 · 5 comments
Closed

Merge and test patch from QCIF #21

nickdos opened this issue Sep 7, 2020 · 5 comments
Assignees
@Rita-C
Labels
enhancement

Comments

@nickdos
Copy link
Contributor

nickdos commented Sep 7, 2020 •
edited
Loading

See Slack message: https://atlaslivingaustralia.slack.com/archives/C015H7ZGTV3/p1599196804002100

Probably need more details for testing this...

Se also: https://github.com/AtlasOfLivingAustralia/ala-infrastructure/issues/723
@ansell
Copy link

ansell commented Sep 7, 2020

The patch moves the caching code related to #20 to a new class, but it still needs changes to make the caching code more resilient.

@nickdos
Copy link
Contributor Author

nickdos commented Sep 30, 2020 •
edited
Loading

Seeing as @Rita-C has made commits to the caching code, the patch code probably won't work now... will need to be done to an older version of the code and then the changes manually copied over, I'm guessing.

EDIT: added patch to this private issue https://github.com/AtlasOfLivingAustralia/ala-infrastructure/issues/723

@ansell
Copy link

ansell commented Sep 30, 2020 •
edited
Loading

Applying the patch to the 3.2.2 tag should work https://github.com/AtlasOfLivingAustralia/ala-bootstrap3/releases/tag/3.2.2 and then a git merge will show the conflicts after that point.

@ansell
Copy link

ansell commented Sep 30, 2020

Just to clarify, if others are concerned about the merge conflict, I am fairly confident in resolving merge conflicts and could try the merge (but not the testing/release afterwards).

@Rita-C
Copy link
Contributor

Rita-C commented Sep 30, 2020

will try Peter's suggestion. probably need more testing details.

Rita-C pushed a commit that referenced this issue Oct 19, 2020
@cofiem @Rita-C
issue #21 : QCIF patch
ddd1851 
Signed-off-by: Peter Ansell <[email protected]>
Rita-C added a commit that referenced this issue Oct 19, 2020
@Rita-C
#21 Merge and test patch from QCIF
160dbee
Rita-C pushed a commit that referenced this issue Oct 19, 2020
@cofiem @Rita-C
issue #21 : QCIF patch
e1bbb57 
Signed-off-by: Peter Ansell <[email protected]>

issue #20 : Only replace cache if template is retrieved successfully

Signed-off-by: Peter Ansell <[email protected]>
Rita-C added a commit that referenced this issue Nov 4, 2020
@Rita-C
Merge pull request #23 from AtlasOfLivingAustralia/develop
6908bac 
issue #21 : QCIF patch
@Rita-C Rita-C closed this as completed Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Rita-C Rita-C

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@ansell @nickdos @Rita-C