This repository was archived by the owner on Jun 24, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 572
Keep roster-add-active-job in sync with master. #2402
Merged
stephaniegiang
merged 255 commits into
github-education-resources:roster-add-active-job
from
shaunakpp:roster-add-active-job
Oct 17, 2019
Merged
Keep roster-add-active-job in sync with master. #2402
stephaniegiang
merged 255 commits into
github-education-resources:roster-add-active-job
from
shaunakpp:roster-add-active-job
Oct 17, 2019
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This spec would fail if the `lti_launch` feature happened to be enabled, which was possible depending on the order of the tests being run. A wider fix would be to add a global RSpec before(:each) hook that disables all features by default.
This reverts commit 280c3b5.
…cue-json Rescue only JSON::ParserError
…ate-docs-lti-version Update docs with LTI version + Names and Roles provisioning
Fix GitHubClassroom.github_url when using Enterprise
…anization-title-changes allow longer organization titles and display logins better
…ert-2409-subtract-starter-repo-commits Revert "subtract starter repo commits from assignment repo commit count"
If a G Suite Super Admin lists courses from Google Classroom, all courses on the domain are returned. When there are many courses, the request times out. Adding teacher_id: "me" to the request fixes this error for G Suite Super Admins
…ert-2404-add_roster_entry_to_assignment_repo_api Revert "Add roster entry to assignment repo internal API"
…er-g-user Fix an issue when a super admin user connects a Google Classroom
…tract-starter-repo-commits define number_of_commits on group_assignment_repo as well
…ove-archive-flag Remove the archive_classrooms Feature Flag
…m-fix Fix search/filter so it works on Firefox
…p_cache_in_a_few_places Skip user cache in a few places where we make API calls
Contributor
|
Hi @shaunakpp I was looking to review this but it looks like there is a sibling PR #2233 is there a difference between these two? |
Contributor
Author
|
Hi @jeffrafter, I opened it to keep the |
e6cb962 to
9f988b7
Compare
…classroom into roster-add-active-job
2 tasks
2087b58
into
github-education-resources:roster-add-active-job
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Updates
roster-add-active-jobwithmasterand removes conflict. Sending PR to keep #2233 in sync withmaster.