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.

Sign up for GitHub

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

Jump to bottom

Revert "Fix part of #5002 remove GCS_RESOURCE_BUCKET_NAME from GLOBAL… #7278

Merged
merged 1 commit into from
Aug 3, 2019
Merged

Revert "Fix part of #5002 remove GCS_RESOURCE_BUCKET_NAME from GLOBAL… #7278

merged 1 commit into from
Aug 3, 2019

Conversation

jameesjohn
Copy link
Contributor

Explanation

This commit reverts #7130 due to some noticed regressions.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "PROJECT: ..." label (Please add this label for the first-pass review of the PR).
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@seanlip seanlip mentioned this pull request Aug 2, 2019
Closed
9 tasks
seanlip
seanlip approved these changes Aug 2, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM. Let's merge once the Travis tests pass.

@seanlip seanlip assigned seanlip and unassigned seanlip Aug 2, 2019
@codecov
Copy link

codecov bot commented Aug 3, 2019 •
edited
Loading

Codecov Report

Merging #7278 into develop will increase coverage by 0.04%.
The diff coverage is 59.25%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #7278      +/-   ##
===========================================
+ Coverage    89.38%   89.42%   +0.04%     
===========================================
  Files         1208     1204       -4     
  Lines        98062    98297     +235     
  Branches      2637     2635       -2     
===========================================
+ Hits         87657    87907     +250     
+ Misses        9770     9754      -16     
- Partials       635      636       +1
Flag Coverage Δ
#backend ?
#frontend ?
Impacted Files Coverage Δ
core/controllers/resources_test.py 100% <ø> (ø) ⬆️
...ge/directives/OppiaNoninteractiveImageDirective.ts 18.91% <ø> (+2.7%) ⬆️
core/controllers/resources.py 100% <ø> (ø) ⬆️
main.py 87.61% <ø> (-0.12%) ⬇️
feconf.py 99.45% <ø> (-0.01%) ⬇️
...jects/templates/ImageWithRegionsEditorDirective.ts 0.77% <0%> (+0.38%) ⬆️
...sions/objects/templates/FilepathEditorDirective.ts 0.86% <0%> (+0.29%) ⬆️
...ctives/OppiaInteractiveImageClickInputDirective.ts 8.23% <0%> (+1.17%) ⬆️
core/controllers/base.py 100% <100%> (ø) ⬆️
...s/dev/head/services/AssetsBackendApiServiceSpec.ts 100% <100%> (+0.88%) ⬆️
... and 566 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5948e1e...3d35650. Read the comment docs.

@kevinlee12
Copy link
Contributor

@seanlip, Travis tests pass!

vojtechjelinek
vojtechjelinek approved these changes Aug 3, 2019
View reviewed changes
Copy link
Contributor

@vojtechjelinek vojtechjelinek left a comment

Choose a reason for hiding this comment

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

LGTM!

@vojtechjelinek vojtechjelinek removed their assignment Aug 3, 2019
@seanlip seanlip merged commit 2570a9e into oppia:develop Aug 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seanlip seanlip seanlip approved these changes

@vojtechjelinek vojtechjelinek vojtechjelinek approved these changes

@aks681 aks681 Awaiting requested review from aks681

@DubeySandeep DubeySandeep Awaiting requested review from DubeySandeep

@kevinlee12 kevinlee12 Awaiting requested review from kevinlee12

@nithusha21 nithusha21 Awaiting requested review from nithusha21

@sophiewu6 sophiewu6 Awaiting requested review from sophiewu6

@vinitamurthi vinitamurthi Awaiting requested review from vinitamurthi

Assignees

@seanlip seanlip

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jameesjohn @kevinlee12 @vojtechjelinek @seanlip