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

fix: Rapid Rudolph will go down in Git history #1291

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Conversation

faucomte97
Copy link
Contributor

@faucomte97 faucomte97 commented Jan 25, 2022

This change is Reviewable

@faucomte97 faucomte97 self-assigned this Jan 25, 2022
Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 51 of 51 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

@codecov
Copy link

codecov bot commented Jan 27, 2022

Codecov Report

Merging #1291 (7bb32db) into master (d525369) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1291   +/-   ##
=======================================
  Coverage   91.70%   91.70%           
=======================================
  Files          98       98           
  Lines        5294     5294           
=======================================
  Hits         4855     4855           
  Misses        439      439           
Impacted Files Coverage Δ
game/theme.py 100.00% <ø> (ø)

@faucomte97 faucomte97 merged commit d04eb51 into master Jan 27, 2022
@faucomte97 faucomte97 deleted the explement_snow branch January 27, 2022 17:24
faucomte97 added a commit that referenced this pull request Dec 6, 2022
faucomte97 added a commit that referenced this pull request Dec 19, 2022
KamilPawel added a commit that referenced this pull request Jan 3, 2023
KamilPawel added a commit that referenced this pull request Jan 3, 2023
* Revert "Revert "fix: Rapid Rudolph will go down in Git history (#1291)" (#1389)"

This reverts commit 937134d.

* build: dummy commit

* dummy commit
faucomte97 added a commit that referenced this pull request Oct 30, 2023
* wip: add compare, variable and number blocks

* Merge branch 'master' into new-blocks

* add variables_numeric_set

* add variables_increment

* custom math_number block and tooltips

* add migration

* Merge branch 'master' into new-blocks

* add variables_set

* replace blockly variables with normal inputs

* Merge branch 'master' into new-blocks

* Merge branch 'master' into new-blocks

* Merge branch 'master' into new-blocks

* fix merge

* Merge branch 'master' into new-blocks

* Merge branch 'master' into new-blocks

* Merge branch 'master' into new-blocks

* Merge branch 'master' into new-blocks

* Rename migrations

* Merge branch 'master' into new-blocks

* Update migration order

* Merge branch 'master' into new-blocks

* Revert "Revert "fix: Rapid Rudolph will go down in Git history (#1291)" (#1389)"

This reverts commit 937134d.

* added a debug console for blocks

* addming more debug sstatements

* adding a quick fix to block duplicates

* adding a quick fix to block duplicates

* more patches

* trying to fix it on the backend

* Merge conflicts

* Reorder migrations

* Add revert code to migration 0079

* Re-add mistakenly removed variables code

* Merge branch 'master' into new-blocks

* Merge branch 'master' into new-blocks

* Fix migrations order

* Merge branch 'master' into new-blocks

* Update lockfile

* Merge conflicts

* Merge branch 'master' into new-blocks

* Update migrations

* Clean up

* Merge branch 'master' into new-blocks

* Try waiting 1 before clicking play

* Increase sleep to 5

* Try running all the tests

* Remove unnecessary time out

* Merge master

* Comment out broken tests

* Skip tests instead

* Remove comment

Co-Authored-By: faucomte97 <florian.aucomt1@ocado.com>
Co-Authored-By: KamilPawel <kamil.sosinski@ocado.com>
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.

2 participants