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

Merge from wilsonc86 master #680

Closed
wants to merge 24 commits into from
Closed

Merge from wilsonc86 master #680

wants to merge 24 commits into from

Conversation

wilsonc86
Copy link
Contributor

@wilsonc86 wilsonc86 commented Aug 7, 2019 •
edited
Loading

  • Wildlife Licensing docker work
  • Ledger foreign data wrapper secondary database setup
  • Fix file permissions
  • DPAW -> DBCA Utils

This change is Reviewable

ropable and others added 24 commits April 11, 2019 14:17
@ropable @dbca-asi
Commit outstanding uncommitted files in prod 11-Apr-2019.
875840a
@wilsonc86
Merge pull request #180 from dbca-wa/master
88e65c3 
pull latest from dbca-wa master
@wilsonc86
WildlifeLicensing: static.dpaw references to cdnjs
3cdf2b1
@wilsonc86
WildlifeLicensing: update requirements for gunicorn/dockerisation
1102328
@wilsonc86
WildlifeLicensing: dockerisation wip
678782d
@wilsonc86
WildlifeLicensing: dockerisation wip, static dpaw references updated …
a107d44 
…for wildlifelicensing
@wilsonc86
WildlifeLicensing: dockerisation wip, added files
441ca6c
@wilsonc86
WildlifeLicensing: dpaw to dbca for wildlifelicensing/ledger
034bda8
@wilsonc86
WildlifeLicensing: dockerfile, env defaults settings updates
26949ab
@wilsonc86
WildlifeLicensing: added newline to end of files missing it
98cc1f9
@wilsonc86
WildlifeLicensing: remove wildlifecompliance static dir from settings…
8dec7eb 
…_base
@wilsonc86
Merge pull request #246 from dbca-wa/master
f45c469 
Update latest from dbca-wa master
@wilsonc86
Merge branch 'wildlifelicensing_docker' into master
8ae1481
@wilsonc86
Delete .dockerignore
25fe4cd
@wilsonc86
Delete .flake8
a9ef5f9
@wilsonc86
Delete Dockerfile
273e344
@wilsonc86
Merge pull request #249 from dbca-wa/master
e34dbb3 
Merge latest from dbca-wa master
@wilsonc86
Ledger: reconfigure Oracle foreign table connectivity to use a django…
82b5253 
… DATABASE_ROUTER
@wilsonc86
Ledger: minor update to routers.py
d3c6d60
@wilsonc86
Merge pull request #250 from wilsonc86/ledger_fdw_router
c1f3a35 
Ledger fdw router
@wilsonc86
Merge pull request #256 from dbca-wa/master
4028969 
Merge latest from dbca-wa master
@wilsonc86
Fix file permissions
906c0d1
@wilsonc86
Minor fix
2cd0dc8
@wilsonc86
Travis: add FDW_MANAGER_DATABASE_URL
722d909
@coveralls
Copy link

coveralls commented Aug 7, 2019 •
edited
Loading

Pull Request Test Coverage Report for Build 794

  • 43 of 53 (81.13%) changed or added relevant lines in 9 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.01%) to 28.438%
Changes Missing Coverage Covered Lines Changed/Added Lines %
ledger/routers.py 4 5 80.0%
manage_wl.py 2 3 66.67%
ledger/settings_base.py 27 29 93.1%
wildlifelicensing/wsgi.py 0 6 0.0%
Files with Coverage Reduction New Missed Lines %
wildlifelicensing/wsgi.py 1 0.0%
Totals Coverage Status
Change from base Build 788: 0.01%
Covered Lines: 17155
Relevant Lines: 60325
💛 - Coveralls

@wilsonc86
Copy link
Contributor Author

closing for now, need to fix fdw_manager app label breaking django admin

@wilsonc86 wilsonc86 closed this Aug 8, 2019
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
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wilsonc86 @coveralls @ropable