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

Rails 4.2 #5501

Merged
merged 19 commits into from Feb 27, 2015

Conversation

@jhass
Copy link
Member

commented Dec 28, 2014

One deprecation warning left, coming from fixture_builder. Didn't run cucumber yet, let's see what Travis says.

diaspora-vines needs a release /cc @Zauberstuhl

Gemfile Outdated
@@ -128,7 +131,7 @@ gem 'twitter', '4.8.1'
gem 'omniauth-wordpress','0.2.1'

# XMPP chat dependencies
gem 'diaspora-vines', '~> 0.1.25'
gem 'diaspora-vines', '~> 0.1.25', github: 'diaspora/vines', branch: 'develop'

This comment has been minimized.

Copy link
@Zauberstuhl

Zauberstuhl Dec 28, 2014

Contributor

increase it to 0.1.26. I can update now and change the next milestone

This comment has been minimized.

This comment has been minimized.

Copy link
@jhass

jhass Dec 29, 2014

Author Member

Thanks!

@jhass jhass force-pushed the jhass:rails42 branch from b30d668 to 9ca6f8f Dec 29, 2014

@jhass jhass changed the title [WIP] Rails 4.2 Rails 4.2 Dec 29, 2014

@jhass

This comment has been minimized.

Copy link
Member Author

commented Dec 29, 2014

Looks like there's now just one randomly failing spec left.

@svbergerem

This comment has been minimized.

Copy link
Member

commented Jan 3, 2015

@jhass Is there an easy way to get rid of the deprecation warning?

@jhass

This comment has been minimized.

Copy link
Member Author

commented Jan 3, 2015

Didn't look into it, but if it's that much of an issue for anybody, the way to go would be fixing it upstream and pulling in the fix as a monkey patch until there's a new upstream release with the fix.

@svbergerem

This comment has been minimized.

Copy link
Member

commented Jan 3, 2015

Oh ok, you already opened an issue upstream: rdy/fixture_builder#30 Looks like there isn't much activity on that repo :-\

@jhass

This comment has been minimized.

Copy link
Member Author

commented Jan 3, 2015

Yeah, unfortunately not.

@jhass jhass force-pushed the jhass:rails42 branch 5 times, most recently from e05618e to 6d6e8c1 Jan 17, 2015

@jhass

This comment has been minimized.

Copy link
Member Author

commented Jan 17, 2015

Slayed the newly randomly failing spec and added some more fixes.

Now really the only thing left is a deprecation warning from fixture_builder. Either this will be patched upstream very soon and we only have live with it for a short time, or this PR would be delayed forever just because of that, therefore I'd vote to ignore it for this PR.

@jhass jhass force-pushed the jhass:rails42 branch 2 times, most recently from 86aa1ac to 8830528 Jan 19, 2015

@jhass jhass force-pushed the jhass:rails42 branch from 8830528 to 8ec1290 Jan 30, 2015

@svbergerem

This comment has been minimized.

Copy link
Member

commented Feb 14, 2015

@jhass There is still no answer from upstream so I'd say we just merge this. I guess this PR could need a rebase. @denschub could you review and merge this PR afterwards?

@jhass jhass force-pushed the jhass:rails42 branch 2 times, most recently from ba2d466 to 58f8dbe Feb 14, 2015

@jhass

This comment has been minimized.

Copy link
Member Author

commented Feb 14, 2015

k, rebased.

@jhass jhass force-pushed the jhass:rails42 branch from 58f8dbe to e16c61d Feb 27, 2015

@jhass jhass force-pushed the jhass:rails42 branch from e16c61d to 678033f Feb 27, 2015

@jhass

This comment has been minimized.

Copy link
Member Author

commented Feb 27, 2015

Rebased.

@goobertron

This comment has been minimized.

Copy link

commented Feb 27, 2015

Cool! <3

@denschub

This comment has been minimized.

Copy link
Member

commented Feb 27, 2015

Looks good to me, tests are green. Will merge.

@denschub denschub merged commit 678033f into diaspora:develop Feb 27, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
hound Hound has reviewed the changes.

denschub added a commit that referenced this pull request Feb 27, 2015

@jhass jhass added this to the next-major milestone Feb 28, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.