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

[354] Make animals.sex an enum #371

Merged
merged 9 commits into from Sep 23, 2020
Merged

[354] Make animals.sex an enum #371

merged 9 commits into from Sep 23, 2020

Commits on Sep 22, 2020

  1. Transform animal sex into an enum

    @viniciusgama
    viniciusgama committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    7499577 View commit details
    Browse the repository at this point in the history

  2. Makes sex an enum field on the animals table

    @viniciusgama
    viniciusgama committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    44f9080 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 354-transform-sex-into-enum 

    * master:
  use helper method
  Add controller spec, redefine UsersController#admin?
  typo
  use concern instead of standalone logic
  Remove unused UntaggedAnimalAssessment model and related code
  Add organization to tanks and fix related specs
  Set up UsersController#show, include related test examples
  Add organization for families
  Add organizations to families
  Add organization association to animal
    @viniciusgama
    viniciusgama committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    5631333 View commit details
    Browse the repository at this point in the history

  4. Animal sex can be nil

    @viniciusgama
    viniciusgama committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    0d85184 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 354-transform-sex-into-enum 

    * master:
  Remove pedigree model and related code
    @viniciusgama
    viniciusgama committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    f6e3a20 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. Allow unknown animal sex

    @viniciusgama
    viniciusgama committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    8631e19 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 354-transform-sex-into-enum

    @viniciusgama
    viniciusgama committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    51719cf View commit details
    Browse the repository at this point in the history

  3. Set unknown as the default sex for an animal

    @viniciusgama
    viniciusgama committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    959b615 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 354-transform-sex-into-enum 

    * master:
  Remove post settlement inventory model and related code
  using current_organization method to get users
  added show link in index view
  setting up index view for users and adding specs
    @viniciusgama
    viniciusgama committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    d8c8bbb View commit details
    Browse the repository at this point in the history