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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bug #4832 select language for email content when invite a friend #4929

Merged
merged 2 commits into from Apr 15, 2014
Merged

fix bug #4832 select language for email content when invite a friend #4929

merged 2 commits into from Apr 15, 2014

Conversation

santosgabriel
Copy link
Contributor

This is my first contribution.
I hope that does not have errors 馃槂

@jhass
Copy link
Member

jhass commented Apr 15, 2014

Great! Just a little rspec test would be nice :)

@jaywink
Copy link
Contributor

jaywink commented Apr 15, 2014

And changelog entry. Welcome to diaspora* development! :)

@santosgabriel
Copy link
Contributor Author

@MrZyx and @jaywink Thanks to this nice work on diaspora*.
I'm just beginning in Rails (4 months), i hope to contribute more and better.

Have a nice day !

@Raven24
Copy link
Member

Raven24 commented Apr 15, 2014

Looking good,
the CI build just seems to have a random error, unrelated to this PR (I
restarted it)

On Tuesday 15 April 2014 05:30:24 Gabriel wrote:

@MrZyx and @jaywink Thanks to this nice work on diaspora*.
I'm just beginning in Rails (4 months), i hope to contribute more and
better.

Have a nice day !


Reply to this email directly or view it on GitHub:
#4929 (comment)

@goobertron
Copy link

@santosgabriel thanks for your contribution. Just one thing: I think that, when contributing code, we're supposed to create a separate branch on our fork for each piece of work and commit to that branch, to keep things tidy. You've committed this to your develop branch, which I think we're not supposed to do. Hopefully it won't cause any problems, but it's worth considering for the future.

@jhass jhass added this to the next milestone Apr 15, 2014
jhass added a commit that referenced this pull request Apr 15, 2014
fix bug #4832 select language for email content when invite a friend
@jhass jhass merged commit 441cc06 into diaspora:develop Apr 15, 2014
@jhass
Copy link
Member

jhass commented Apr 15, 2014

Thank you!

@goobertron is right about the branch. It'll be no issue this time, I think, since it got merged quickly, but for the future make sure to follow https://wiki.diasporafoundation.org/Git_workflow

@santosgabriel
Copy link
Contributor Author

@goobertron and @MrZyx

Thanks for the advice, next time i will create a new branch on my fork repo.

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

5 participants