Skip to content

Fix method name collision #189

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
Merged
merged 3 commits into from
Oct 20, 2017
Merged

Fix method name collision #189

merged 3 commits into from
Oct 20, 2017

Conversation

rpkilby
Copy link
Collaborator

@rpkilby rpkilby commented Oct 20, 2017 •
edited
Loading

Fixes #187

Ryan P Kilby added 2 commits October 20, 2017 15:38
Move 'get_filter_name' => 'get_param_filter_name'
d1c3529
Fix tz awareness regression test
bda0ae6 
DRF only appends the Zulu prefix if the datetime is in UTC.
@rpkilby rpkilby added this to the v0.11 milestone Oct 20, 2017
@codecov-io
Copy link

codecov-io commented Oct 20, 2017 •
edited
Loading

Codecov Report

Merging #189 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #189   +/-   ##
=======================================
  Coverage   99.53%   99.53%           
=======================================
  Files           6        6           
  Lines         217      217           
  Branches       42       42           
=======================================
  Hits          216      216           
  Partials        1        1
Impacted Files Coverage Δ
rest_framework_filters/filterset.py 99.14% <100%> (ø) ⬆️

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 49b77cc...3b15cb9. Read the comment docs.

@rpkilby rpkilby changed the title Fix django-filters v1.1 compatibility Fix method name collision Oct 20, 2017
@rpkilby rpkilby merged commit 373242f into philipn:master Oct 20, 2017
@rpkilby rpkilby deleted the filters-compat branch October 20, 2017 19:58
@rpkilby rpkilby mentioned this pull request Nov 7, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v0.10.2
Development

Successfully merging this pull request may close these issues.
2 participants
@rpkilby @codecov-io