Closed bryanlandia closed 1 year ago
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
298 |
Current conflicts | 298 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
313 |
Current conflicts | 313 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
315 |
Current conflicts | 315 |
Summary | Good work! No added conflicts. |
This didn't work out... it works, but too much of the Open edX standard API is not made using GenericAPIView from DRF.
Still the code developed for the filters can be used to dynamically generate Queryset filters for a proxy model with custom default manager (objects
) approach.
Change description
Attempting to handle multi-tenancy protections for full API.
Type of change
Related issues
https://appsembler.atlassian.net/browse/ENG-176
Checklists
Development
Security
Code review