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

DTL (Test > Levelbuilder): 144526f0 #36533

Merged
merged 43 commits into from
Aug 31, 2020
Merged

DTL (Test > Levelbuilder): 144526f0 #36533

merged 43 commits into from
Aug 31, 2020

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

Erin Peach and others added 30 commits July 22, 2020 16:33
Update the maker toolkit warning text
819444d
Merge branch 'staging' into enable-mb-toolkit
8a54831
Merge branch 'gemfile-update-bcrypt' into enable-mb-toolkit
720156b
UI components for selecting board
b0b6a1d
Change toggleMaker to setMaker
90a3ef9
Update tests from toggle to setMaker
f46f9fb
@sureshc
Use a copy of the script that converted the datatype of the user_leve…
4801572 
…ls id column as a starting point.
@sureshc
Configure migration to run directly on primary cluster, since we don'…
5d6ab2e 
…t operate a replica anymore.
Update boolean makerEnabled to string makerEnabled
ad7a724
@sureshc
Make it executable.
ad94d83
@breville
Maker: show micro:bit or Circuit Playground in App Lab Toolbox
fc1fb4a
@breville
Maker: fix unit tests
ac4b942
@breville
Merge branch 'staging' into enable-mb-toolkit
cad55e2
@breville
Maker: fix unit tests
711cf96
Use constants in place of strings
bf1701c
Merge branch 'enable-mb-toolkit' of github.com:code-dot-org/code-dot-…
4d72f7c 
…org into enable-mb-toolkit
handle case where text is nil
3dbe16c
make sure current_user exists before calling method
fabf470
@Erin007
set default hint_prompt_attempts_threshold to 6.5
16489e8
@jmkulwik
Cap the time_spent recorded per milestone to one hour
9f95080
@jmkulwik
Merge pull request #36505 from code-dot-org/cap-time-spent
0553b32 
Cap the time_spent recorded per milestone to one hour
@deploy-code-org
Merge pull request #36511 from code-dot-org/staging
3ab753d 
DTT (Staging > Test) [robo-dtt]
PR feedback
5acdc1a
@deploy-code-org
dashboard i18n sync
f16441b
@deploy-code-org
hoc i18n sync
37eabd3
@Erin007
Update dashboard/app/helpers/levels_helper.rb
a06c349 
Co-authored-by: Madelyn Kasula <maddie.kasula@code.org>
@Erin007
Update dashboard/app/helpers/levels_helper.rb
3b6534d 
Co-authored-by: Madelyn Kasula <maddie.kasula@code.org>
@Erin007
Merge pull request #36507 from code-dot-org/baseline-hint-prompt-atte…
67b54b0 
…mpts-threshold

Hints: add a default hint prompt attempts threshold
@deploy-code-org
Merge pull request #36518 from code-dot-org/staging
3e9a21b 
DTT (Staging > Test) [robo-dtt]
Merge pull request #36288 from code-dot-org/enable-mb-toolkit
c09acf6 
Maker: Enable micro:bit toolkit in App Lab
sureshc and others added 13 commits August 31, 2020 11:00
@sureshc
Merge pull request #36110 from code-dot-org/add_time_spent_to_user_le…
b255ce5 
…vels_with_gh_ost

Use gh-ost to add time_spent column to user_levels on production
Revert "Maker: Enable micro:bit toolkit in App Lab"
a7d1d1f
Merge pull request #36519 from code-dot-org/revert-36288-enable-mb-to…
5a6a074 
…olkit

Revert "Maker: Enable micro:bit toolkit in App Lab"
@deploy-code-org
Merge pull request #36521 from code-dot-org/staging
2bb6f01 
DTT (Staging > Test) [robo-dtt]
@Hamms
Merge pull request #36516 from code-dot-org/i18n-sync-in-up-08-31-2020
555243e 
I18n sync In & Up 08/31
update syntax
b5dd434
@deploy-code-org
Merge pull request #36523 from code-dot-org/staging
879fae8 
DTT (Staging > Test) [robo-dtt]
Merge pull request #36479 from code-dot-org/regex-scan-error
bffdd2d 
Fix NoMethodError
@deploy-code-org
staging content changes (-robo-commit)
3829ad1
@deploy-code-org
Merge pull request #36525 from code-dot-org/levelbuilder
c7883e5 
DTS (Levelbuilder > Staging) [robo-dts]
@deploy-code-org
Merge pull request #36526 from code-dot-org/staging
821920e 
DTT (Staging > Test) [robo-dtt]
Merge pull request #36480 from code-dot-org/assessments-error
384bc4d 
Fix NoMethodError in assessments controller
@deploy-code-org
Merge pull request #36532 from code-dot-org/staging
144526f 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org requested a review from a team as a code owner August 31, 2020 22:20
@deploy-code-org deploy-code-org merged commit cc6640c into levelbuilder Aug 31, 2020
@deploy-code-org deploy-code-org deleted the dtl_candidate_144526f0 branch August 31, 2020 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@deploy-code-org @sureshc @breville @Erin007 @jmkulwik @Hamms