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.

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

Making the method Utils.toText() accept objects #92

Merged
merged 1 commit into from
Feb 10, 2014
Merged

Making the method Utils.toText() accept objects #92

merged 1 commit into from
Feb 10, 2014

Conversation

duckbox
Copy link

@duckbox duckbox commented Feb 9, 2014

@duckbox
Copy link
Author

duckbox commented Feb 10, 2014

I also added a commit that edits the gruntfile to ease the process of contributing. Instead of running the default grunt process, we establish another command to run the lint and test tasks, thus removing the build task. This avoids the future complications of PRs containing edited dist contents.

@yyx990803
Copy link
Member

Hmm the grunt task change isn't really necessary. The casper task requires build to be run first anyways, because it's using dist/vue.js. I have edited the contrib guide to clarify not checking in dist files.

Also let's avoid mixing changes for different purposes in the same PR.

@duckbox
Copy link
Author

duckbox commented Feb 10, 2014

Yeah, that was a mistake on my part. I forgot that this was still open. I've reverted that commit leaving the original commit as the sole PR.

@yyx990803
Copy link
Member

Looking good! My last request: can you make it a single clean commit? (ideally, git reset to the commit where you started, make a single commit, then push -f to your fork.)

@duckbox
Copy link
Author

duckbox commented Feb 10, 2014

Commit spring cleaned. Apologies again.

yyx990803 added a commit that referenced this pull request Feb 10, 2014
Making the method Utils.toText() accept objects
@yyx990803 yyx990803 merged commit 6606ac4 into vuejs:dev Feb 10, 2014
@yyx990803
Copy link
Member

No need to apologize! Thanks for the great work =)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants