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

Endpoint fixes #2700

Merged
merged 2 commits into from
Nov 13, 2018
Merged

Endpoint fixes #2700

merged 2 commits into from
Nov 13, 2018

Conversation

octavioamu
Copy link
Contributor

@octavioamu octavioamu commented Nov 5, 2018

Description

Change statics urls to use Django url

Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
Testing
Refers/Fixes

owocki
owocki previously approved these changes Nov 7, 2018
Copy link
Contributor

@owocki owocki left a comment

Choose a reason for hiding this comment

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

LGTM minus the merge conflicts

@codecov
Copy link

codecov bot commented Nov 7, 2018

Codecov Report

Merging #2700 into master will increase coverage by 1.28%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2700      +/-   ##
==========================================
+ Coverage   28.65%   29.93%   +1.28%     
==========================================
  Files         163      162       -1     
  Lines       13085    13052      -33     
  Branches     1752     1743       -9     
==========================================
+ Hits         3749     3907     +158     
+ Misses       9237     9021     -216     
- Partials       99      124      +25
Impacted Files Coverage Δ
app/avatar/admin.py 68.42% <0%> (-0.81%) ⬇️
app/kudos/models.py 49.67% <0%> (-0.65%) ⬇️
app/dashboard/utils.py 35.55% <0%> (-0.4%) ⬇️
app/app/settings.py 80.16% <0%> (-0.09%) ⬇️
...board/management/commands/cleanup_dupe_profiles.py 0% <0%> (ø) ⬆️
app/retail/emails.py 20.85% <0%> (ø) ⬆️
app/avatar/utils.py 18.43% <0%> (ø) ⬆️
...rd/management/commands/cleanup_stray_activities.py
app/dashboard/views.py 12.93% <0%> (+0.04%) ⬆️
app/marketing/models.py 60.3% <0%> (+0.5%) ⬆️
... and 3 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 1874f95...1e1484c. Read the comment docs.

@codecov
Copy link

codecov bot commented Nov 7, 2018

Codecov Report

Merging #2700 into master will decrease coverage by 0.18%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2700      +/-   ##
==========================================
- Coverage   28.83%   28.65%   -0.19%     
==========================================
  Files         164      163       -1     
  Lines       13125    13085      -40     
  Branches     1755     1752       -3     
==========================================
- Hits         3785     3749      -36     
- Misses       9233     9236       +3     
+ Partials      107      100       -7
Impacted Files Coverage Δ
app/dashboard/ios.py 20.89% <0%> (-56.89%) ⬇️
app/dashboard/utils.py 35.95% <0%> (-6.3%) ⬇️
app/app/utils.py 19.64% <0%> (-1.34%) ⬇️
app/kudos/admin.py 57.57% <0%> (-1.25%) ⬇️
app/economy/utils.py 95.23% <0%> (-0.22%) ⬇️
app/dashboard/models.py 51.1% <0%> (-0.18%) ⬇️
app/bounty_requests/admin.py 100% <0%> (ø) ⬆️
app/retail/management/commands/warm_cache.py 0% <0%> (ø) ⬆️
...eting/management/commands/assemble_leaderboards.py 25.5% <0%> (ø) ⬆️
app/gas/utils.py 35.38% <0%> (ø) ⬆️
... and 16 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 2625644...30db193. Read the comment docs.

@octavioamu
Copy link
Contributor Author

@owocki yes I think you fixed the search urls in master.
All resolved now!

@owocki
Copy link
Contributor

owocki commented Nov 8, 2018

@mbeacom ?

@octavioamu octavioamu requested a review from mbeacom November 12, 2018 13:26
@SaptakS
Copy link
Contributor

SaptakS commented Nov 13, 2018

@octavioamu can you resolve the conflicts?

@octavioamu
Copy link
Contributor Author

@SaptakS Ready!! Please if everything ok now, merge it asap to avoid new conflicts.

@SaptakS SaptakS merged commit 457d939 into master Nov 13, 2018
@thelostone-mc thelostone-mc deleted the endpoint-fixes branch December 28, 2018 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants