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

Teacher merge feature #51

Merged
merged 93 commits into from
Apr 22, 2024
Merged

Teacher merge feature #51

merged 93 commits into from
Apr 22, 2024

Conversation

ArushC
Copy link

@ArushC ArushC commented Apr 15, 2024

Pivotal Tracker Link

This is a duplicate of beautyjoy#307.

What this PR does:

This pull request fixes|implements (pick one...) ______.

Include screenshots, videos, etc.

Who authored this PR?

How should this PR be tested?

  • Is there a deploy we can view?
  • What do the specs/features test?
  • Are there edge cases to watch out for?

Are there any complications to deploying this?

Checklist:

  • Has this been deployed to a staging environment or reviewed by a customer?
  • Tag someone for code review (either a coach / team member)
  • I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. michael/12345-add-new-feature Any branch name will do as long as the story ID is there. You can use git checkout -b [new-branch-name])

dependabot bot and others added 30 commits February 28, 2024 01:44
Bumps [rails](https://github.com/rails/rails) from 6.1.7.6 to 6.1.7.7.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](rails/rails@v6.1.7.6...v6.1.7.7)

---
updated-dependencies:
- dependency-name: rails
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.8.1.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@v2.2.8...v2.2.8.1)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…ck-2.2.8.1

Bump rack from 2.2.8 to 2.2.8.1
…ils-6.1.7.7

Bump rails from 6.1.7.6 to 6.1.7.7
…po-fixes

187186207/iter1 golden repo fixes
Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](ruby/rdoc@v6.6.2...v6.6.3.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…bmission

187167707 teacher form submission
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@razztech razztech force-pushed the teacher-merge-feature branch from 1b26462 to 29b2e68 Compare April 15, 2024 18:27
@ArushC ArushC force-pushed the teacher-merge-feature branch from 81a9f5a to 95c8b82 Compare April 16, 2024 23:48
@razztech razztech force-pushed the teacher-merge-feature branch 3 times, most recently from 70e98f5 to 7fb905a Compare April 19, 2024 23:23
@ArushC ArushC force-pushed the teacher-merge-feature branch from ad38df9 to 7fb905a Compare April 22, 2024 17:24
Copy link

codecov bot commented Apr 22, 2024

Codecov Report

Attention: Patch coverage is 87.50000% with 8 lines in your changes are missing coverage. Please review.

Project coverage is 85.11%. Comparing base (dbeb705) to head (15b71fb).
Report is 79 commits behind head on main.

❗ Current head 15b71fb differs from pull request most recent head 867b4bd. Consider uploading reports for the commit 867b4bd to get more accurate results

Files Patch % Lines
app/models/school.rb 54.54% 5 Missing ⚠️
app/controllers/merge_controller.rb 96.87% 1 Missing ⚠️
app/controllers/schools_controller.rb 66.66% 1 Missing ⚠️
app/controllers/teachers_controller.rb 88.88% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #51      +/-   ##
==========================================
- Coverage   86.70%   85.11%   -1.59%     
==========================================
  Files          24       29       +5     
  Lines         797      927     +130     
==========================================
+ Hits          691      789      +98     
- Misses        106      138      +32     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ArushC
Copy link
Author

ArushC commented Apr 22, 2024

Merging of the "personal emails" field currently defaults to the personal emails of the user being merged into. A future feature might change this to concatenate the personal emails of the users being merged.

Copy link

@fp456 fp456 left a comment

Choose a reason for hiding this comment

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

LGTM!

@ArushC ArushC merged commit ca6c172 into main Apr 22, 2024
6 checks passed
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.

4 participants