Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pytest-dev/pytest-django
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: blueyed/pytest-django
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: merge-RonnyPfannschmidt-db-copy
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 11, 2013

  1. make conftest settings a fixture, so we dont break

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    5bb2232 View commit details
    Browse the repository at this point in the history

  2. set test postgres host to None, so we dont need a password

    @RonnyPfannschmidt
    RonnyPfannschmidt committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    9b83cc5 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2014

  1. Merge branch 'RonnyPfannschmidt-db-copy' 

    Added an additional comment to the HOST=None setting for postgres.

Conflicts:
	tests/conftest.py
	tests/settings_postgres.py
    @blueyed
    blueyed committed Jul 9, 2014
    Configuration menu
    Copy the full SHA
    b1a1561 View commit details
    Browse the repository at this point in the history
Loading