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

[SYNC] master => develop #22

Merged
53 commits merged into from
Feb 27, 2024
Merged

[SYNC] master => develop #22

53 commits merged into from
Feb 27, 2024

Conversation

aziolek
Copy link
Member

@aziolek aziolek commented Feb 23, 2024

No description provided.

aziolek and others added 30 commits February 13, 2024 12:41
[RELEASE] 0.2 (develop)

See merge request golemfoundation/governance/octant!1099
… 'master'

OCT-1365 fix rewards calculator exceptions

See merge request golemfoundation/governance/octant!1149
OCT-1362 Remove Check stats tip tile from Metrics page

See merge request golemfoundation/governance/octant!1148
OCT-1361 Metrics: add staking to epoch funds usage

See merge request golemfoundation/governance/octant!1147
OCT-1335 Anvil: Enable locking gas price for forks with EIP-1559 enabled

See merge request golemfoundation/governance/octant!1143
OCT-1370 Patron earnings on Earn view are not displaying correct values
@aziolek
Copy link
Member Author

aziolek commented Feb 23, 2024

@mike-code: here we have unsigned commits. AFAIK I can't sign commits from the past, especially not w/o overriding the history, which will break our repo. I think we need to enable merging unsigned commits at least for this PR and then reinstall this rule back in place.

@mike-code
Copy link
Contributor

@mike-code: here we have unsigned commits. AFAIK I can't sign commits from the past, especially not w/o overriding the history, which will break our repo. I think we need to enable merging unsigned commits at least for this PR and then reinstall this rule back in place.

let me know when you're ready to do this merge and I will lift that restriction before merging it

@aziolek
Copy link
Member Author

aziolek commented Feb 23, 2024

@mike-code: here we have unsigned commits. AFAIK I can't sign commits from the past, especially not w/o overriding the history, which will break our repo. I think we need to enable merging unsigned commits at least for this PR and then reinstall this rule back in place.

let me know when you're ready to do this merge and I will lift that restriction before merging it

Even right now. You can do it yourself. Lift it, merge it, put it back down.

@housekeeper-bot housekeeper-bot temporarily deployed to master February 23, 2024 15:55 Destroyed
@housekeeper-bot housekeeper-bot temporarily deployed to master February 27, 2024 07:55 Destroyed
@housekeeper-bot housekeeper-bot temporarily deployed to master February 27, 2024 12:47 Destroyed
@aziolek aziolek closed this pull request by merging all changes into develop in d1944ff Feb 27, 2024
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.

5 participants