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

Trigger Jenkins #23367

Closed
wants to merge 189 commits into from
Closed

Trigger Jenkins #23367

wants to merge 189 commits into from

Conversation

mdandrad
Copy link

Want to merge develop branch to master - Pull Request [ucsd-ets/edx-platform] Bug Fix (#321)

Ned Batchelder and others added 30 commits January 18, 2019 16:19
without blocking multiple concurrent sessions

also updates trace amounts of copy duplicated in tests between
edx-proctoring and edx-platform

JIRA:EDUCATOR-3931
(cherry picked from commit 673fb79)
(cherry picked from commit f7799ba)
JWKs are used for micro-frontends and OAuth scopes.  The Ironwood
installation process doesn't yet create the JWKs needed.  For Ironwood,
at least don't fail trying to use the empty settings.  By default,
micro-frontends and OAuth scopes will be unavailable.
Don't fail if the JWK settings aren't set
(cherry picked from commit 84f609a)
(cherry picked from commit 91ed450)
(cherry picked from commit 44ca4d4)
…ty-fix

update django wiki for ironwood release
(cherry picked from commit 12931ae)
(cherry picked from commit c5f396b)
This PR is based on openedx#19284 and is part of the
series of work related to the proposal openedx#18134.

This PR avoids the assignment of
anonymous/unenrolled users to any cohort when
course is public. Anonymous or unenrolled users
will only see content that does not have a
content group assigned.
The "View Course" link to the course outline
is shown on the course about page for a course
marked public/public outline.
It also makes course handouts available for
public courses (not for public_outline).
This PR also hides the different warnings and
messages asking the user to sign-in and enroll
in the course, when the course is marked public.
It modifies the default public_view text to
include the component display_name when
unenrolled access is not available.
Edit worker type in ironwood Jenkinsfiles
We've been running into OoM issues with this functionality while
executing on one of our smaller application servers.
- Sometimes this manifests by preventing the entire page from loading
  (exception during the GET).
- At others, it occurs using the `Delete course from site` functionality
  by breaking during the POST handler. This case is particularly
  frustrating because the course actually is deleted, but looks like it
  may not have been. Internally, this is because the 500 error occurs
  _after_ the course has been successfully deleted, though this is
  opaque to the end-user.

While this doesn't address the underlying memory issue,
it does at least allow the app to recover gracefully.

(cherry picked from commit 25be889)
This removes the portion of the CCX course names data migration
that triggers course publishing. While course publishing is the
desired behavior, doing so within the migration makes it so that
this migration is not practical to run if you have hundreds or
thousands of CCX courses (we run out of memory).

By doing the data migration without the accompanying course
publishes, this means that CCX course names will still show up
incorrectly for courses until there is an edit or publish of
either that CCX course or the underlying course that the CCX
course extends. But we at least set up the data so that it's
gradually self-correcting over time, and do so with little coding
effort or operational risk/weirdness.

A more comprehensive fix for this would involve:

* Fixing the memory leak around CourseOverviews creation and/or;
* Moving CourseOverview generation to happen asynchronously and/or;
* Being more careful about transactionality in the data migration
  and running it repeatedly until it all passes.

Full details of our migration issues are at:

https://github.com/edx/edx-platform/pull/18808#issuecomment-422930820
(cherry picked from commit 5f97cec)
mdandrad and others added 18 commits February 21, 2020 14:40
target file to edit in bundle
./common/static/bundles/StudentAccountDeletionInitializer.js
…_error

Hot - Fix for SuspeciousFileOperation error on certificate preview.
…side-certificate-language

Replace certificate language in lms and core
update quotation marks
…ion-verified-message

Remove verified word from unenroll confirmation box
…lpLinksToCMS

Mdandrad/content update/update help links to cms
update link
Link element is being displayed text vs link
Update sentence
Added "Help"
@mdandrad mdandrad requested review from a team March 11, 2020 00:49
@openedx-webhooks
Copy link

Thanks for the pull request, @mdandrad! I've created OSPR-4225 to keep track of it in JIRA. JIRA is a place for product owners to prioritize feature reviews by the engineering development teams.

Feel free to add as much of the following information to the ticket:

  • supporting documentation
  • edx-code email threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will still be done via the GitHub pull request interface. As a reminder, our process documentation is here.

We can't start reviewing your pull request until you've submitted a signed contributor agreement or indicated your institutional affiliation. Please see the CONTRIBUTING file for more information.

@openedx-webhooks openedx-webhooks added needs triage open-source-contribution PR author is not from Axim or 2U labels Mar 11, 2020
@mdandrad mdandrad closed this Mar 11, 2020
@openedx-webhooks
Copy link

@mdandrad Even though your pull request wasn’t merged, please take a moment to answer a two question survey so we can improve your experience in the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
None yet
Development

Successfully merging this pull request may close these issues.