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

If sails is already loaded, do not load again #66

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

If sails is already loaded, do not load again #66

wants to merge 6 commits into from

Commits on Jun 11, 2015

  1. If sails is already loaded, do not load again

    @kmcgrath
    kmcgrath committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    9943a34 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. Merge branch 'feature/load-all-config' into develop 

    Conflicts:
	lib/sails-migrations/helpers/sails_integration.js
    @kmcgrath
    kmcgrath committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    d350717 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. Update package.json

    @kmcgrath
    kmcgrath committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    c8f6afa View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2016

  1. Merge branch 'master' of https://github.com/BlueHotDog/sails-migrations… 

    … into feature/look-for-sails

Conflicts:
	lib/sails-migrations/helpers/sails_integration.js
    @kmcgrath
    kmcgrath committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    30c2547 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/look-for-sails 

    Conflicts:
	lib/sails-migrations/helpers/sails_integration.js
    @kmcgrath
    kmcgrath committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    71f5488 View commit details
    Browse the repository at this point in the history

  3. use sailsPathStr

    @kmcgrath
    kmcgrath committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    0e67288 View commit details
    Browse the repository at this point in the history