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

SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) #21094

Merged
merged 4 commits into from Jul 16, 2019

Conversation

@pomegranited
Copy link
Contributor

commented Jul 12, 2019

Fixes bug introduced by #20742 (reverted by #21049)

JIRA tickets: OSPR-3739

Sandbox URL: TBD - sandbox is being provisioned.

Merge deadline: None

Testing instructions:

See #20742 for test instructions.

To verify that the bug introduced by the previous PR is repaired:

  1. Submit a response to a discussion forum post.
    Note that the author link is clickable, and not displayed as raw HTML.

Reviewers

  • @SSPJ
  • edX reviewer[s] TBD
pomegranited added 4 commits Jun 3, 2019
imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

(cherry picked from commit 8f89b1e)
Accidentally pasted two topic-template blocks.

(cherry picked from commit dc2b908)
* Fixed where possible.
* Ignored error where fix required changing the translated text string,
  due to differences between underscore and HtmlUtils format strings.

(cherry picked from commit 14bc0c9)
@edx-webhook

This comment has been minimized.

Copy link

commented Jul 12, 2019

Thanks for the pull request, @pomegranited! I've created OSPR-3739 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.

@pomegranited pomegranited changed the title SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) WIP SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) Jul 12, 2019
@pomegranited

This comment has been minimized.

Copy link
Contributor Author

commented Jul 12, 2019

jenkins run bokchoy

@edx-status-bot

This comment has been minimized.

Copy link

commented Jul 12, 2019

Your PR has finished running tests. There were no failures.

@SSPJ

This comment has been minimized.

Copy link

commented Jul 12, 2019

👍 Looks good, @pomegranited .

  • I tested this: created a post and noted that the author link in the header was clickable:

    image

  • I read through the code

  • I checked for accessibility issues: link is reachable by keyboard

  • Includes documentation n/a

@pomegranited pomegranited changed the title WIP SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) Jul 13, 2019
@pomegranited

This comment has been minimized.

Copy link
Contributor Author

commented Jul 13, 2019

Thank you @SSPJ !
@natabene This is ready for edX review. CC @ormsbee

@pomegranited

This comment has been minimized.

Copy link
Contributor Author

commented Jul 16, 2019

Thank you @ormsbee ! Would you like to squash and merge, so we can see if this passes the e2e tests?

@ormsbee ormsbee merged commit d3ce0b7 into edx:master Jul 16, 2019
7 of 8 checks passed
7 of 8 checks passed
Datree Smart Policy Best Practices Verification
Details
Datree insights datreeio insights events
Details
codecov/project 94.89% (target 85%)
Details
jenkins/a11y Build finished.
Details
jenkins/bokchoy Build finished.
Details
jenkins/js Build finished.
Details
jenkins/python Build finished.
Details
jenkins/quality Build finished.
Details
@edx-webhook

This comment has been minimized.

Copy link

commented Jul 16, 2019

@pomegranited 🎉 Your pull request was merged!

Please take a moment to answer a two question survey so we can improve your experience in the future.

@pomegranited pomegranited deleted the open-craft:jill/inline-discussion-underscore-fix branch Jul 16, 2019
@edx-pipeline-bot

This comment has been minimized.

Copy link
Contributor

commented Jul 16, 2019

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production on Wednesday, July 17, 2019.

@edx-pipeline-bot

This comment has been minimized.

Copy link
Contributor

commented Jul 17, 2019

EdX Release Notice: This PR has been deployed to the production environment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.