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

Issue #4124 Check write access before authorizing Twitter #4344

Conversation

oliverbarnes
Copy link
Contributor

No description provided.

@oliverbarnes
Copy link
Contributor Author

Looks like the build is failing due to tests that were already broken

@svbergerem
Copy link
Member

You changed a lot of language files. Afaik you should change config/locales/diaspora/en.yml and must not change any other language file. All other languages will be done via webtranslateit. @MrZyx is that right?

@jhass
Copy link
Member

jhass commented Aug 5, 2013

@svbergerem is right, please only ever edit en.yml.

@jhass
Copy link
Member

jhass commented Aug 5, 2013

And the failures indicate that you introduced an endless recursion somewhere.

@@ -189,6 +189,7 @@ end


group :development, :test do
# gem 'pry'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The guard gem already pulls in pry as a dependency, so you can just require and use it.

@oliverbarnes
Copy link
Contributor Author

Ok, just committed the fixes for the issues pointed out. Sorry about the locale files, I thought I was being thorough :) Should I revert that?

@jhass
Copy link
Member

jhass commented Aug 5, 2013

Yes, please only edit the *en.yml variants.

@jhass
Copy link
Member

jhass commented Aug 5, 2013

Okay, this is looking really good now, please just revert the changes to db/schema.rb, add a changelog entry and squash the commits together:

git checkout 4124-check-twitter-write-access-before-auth
git checkout develop db/schema.rb
$EDITOR Changelog.md
git commit -m "revert db/schema.rb changes and added changelog entry" db/schema.rb Changelog.md
git rebase -i develop
# Leave the first line at pick, choose squash, or s in short, for all other lines
git push -f origin 4124-check-twitter-write-access-before-auth

@oliverbarnes
Copy link
Contributor Author

Done, thanks for the walk-through

@jhass
Copy link
Member

jhass commented Aug 6, 2013

Thank you!

jhass added a commit that referenced this pull request Aug 6, 2013
…ccess-before-auth

Issue #4124 Check write access before authorizing Twitter
@jhass jhass merged commit 55a5871 into diaspora:develop Aug 6, 2013
@oliverbarnes oliverbarnes deleted the 4124-check-twitter-write-access-before-auth branch August 6, 2013 19:33
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.

3 participants