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

⚠️ CONFLICT! Lineage pull request for: skeleton #56

Merged
merged 14 commits into from
Oct 22, 2020
Merged

⚠️ CONFLICT! Lineage pull request for: skeleton #56

merged 14 commits into from
Oct 22, 2020

Commits on Oct 9, 2020

  1. Add link to how to set up a new repo with skeletons

    @hillaryj
    hillaryj committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    e14ecde View commit details
    Browse the repository at this point in the history

  2. Add line breaks for linting 

    Pre-commit is now installed properly.
    @hillaryj
    hillaryj committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    57d927d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. Remove seed-isort-config pre-commit hook 

    As of isort >=5, which we use, the seed-isort-config hook has been deprecated,
and the repository archived. I have removed the hook and the configuration
options it updated as a result.
    @mcdonnnj
    mcdonnnj committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    b5ef97d View commit details
    Browse the repository at this point in the history

  2. Use local filename in README link

    @mcdonnnj
    mcdonnnj committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    de409db View commit details
    Browse the repository at this point in the history

  3. Run pre-commit autoupdate

    @mcdonnnj
    mcdonnnj committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    59eef4c View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. Merge pull request #53 from cisagov/add-how-to-skeleton 

    Add link to how to set up a new repo with skeletons
    @mcdonnnj
    mcdonnnj authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    a9ef644 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into pre-commit_updates

    @mcdonnnj
    mcdonnnj authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    1928db6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54 from cisagov/pre-commit_updates 

    Update pre-commit Hooks
    @mcdonnnj
    mcdonnnj authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    4d88e06 View commit details
    Browse the repository at this point in the history

  4. Resolve Lineage conflicts

    @mcdonnnj
    mcdonnnj committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    a1c3228 View commit details
    Browse the repository at this point in the history

  5. Add explanation for the noqa used in one of the tests

    @mcdonnnj
    mcdonnnj committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    73a7dcd View commit details
    Browse the repository at this point in the history

  6. Change a test name to be more descriptive

    @mcdonnnj
    mcdonnnj committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    72715e3 View commit details
    Browse the repository at this point in the history

  7. Change repo for the prettier pre-commit hook 

    Per prettier/prettier#9459 and specifically
prettier/prettier#9459 (comment)
the prettier hook for pre-commit is being broken out into its own repo.
    @mcdonnnj
    mcdonnnj committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    919460c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #55 from cisagov/migrate_prettier_hook 

    Change repo for the prettier pre-commit hook
    @mcdonnnj
    mcdonnnj authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    e44762c View commit details
    Browse the repository at this point in the history

  9. Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

    felddy committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    e08b5bc View commit details
    Browse the repository at this point in the history