Improvement/ember cli mirage #42
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -50,6 +50,13 @@ | |||
| </a> | |||
| {{/if}} | |||
| {{link-to "Frolfr" "index" id="title" classNames="navbar-brand navbar-brand-text navbar-left navbar-link"}} | |||
| {{#if currentUser.isAuthenticated}} | |||
There was a problem hiding this comment.
Why was this commit included in the PR?
|
Looks good! |
|
I figured we'd run into some merge conflicts after #41 |
ultimatemonty
force-pushed
the
improvement/ember-cli-mirage
branch
from
26c173a to
d432273
Compare
|
@gschorkopf removed the template commit and the ember-cli-build commit, and merge the upstream master. Should be good to go now |
|
Seems legit! Thanks for getting this started! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@gschorkopf @pdougall1 this sets up some super basic mirage routes to enable devs to at least get the site loading locally without the Rails API running. Lots still to be done but this is a start