Skip to content
This repository was archived by the owner on Jun 24, 2024. It is now read-only.

Conversation

@shaunakpp
Copy link
Contributor

What

Updates roster-add-active-job with master and removes conflict. Sending PR to keep #2233 in sync with master.

Nathaniel Woodthorpe and others added 30 commits June 6, 2017 13:36
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.
…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
JessRudder and others added 22 commits October 7, 2019 12:49
…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
@jeffrafter jeffrafter removed the request for review from mozzadrella October 17, 2019 15:48
@jeffrafter
Copy link
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?

@shaunakpp
Copy link
Contributor Author

shaunakpp commented Oct 17, 2019

Hi @jeffrafter, I opened it to keep the roster-add-active-job branch up-to-date with the master branch. We can close this if the original branch is now updated. 😅

@shaunakpp shaunakpp force-pushed the roster-add-active-job branch from e6cb962 to 9f988b7 Compare October 17, 2019 18:51
@shaunakpp shaunakpp changed the title Roster add active job Keep roster-add-active-job in sync with master. Oct 17, 2019
@stephaniegiang stephaniegiang merged commit 2087b58 into github-education-resources:roster-add-active-job Oct 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.