search

scaffeinate / socify

:rocket: Socify is an open source social networking platform written in Ruby on Rails
http://socifyapp.herokuapp.com
GNU General Public License v2.0
375 stars 210 forks source link

Bring develop into master #36

Closed malachaifrazier closed 5 years ago

malachaifrazier commented 7 years ago

Merged develop into master and corrected all conflicts so active development may continue.

scaffeinate commented 7 years ago

+1 for the Pull Request @malachaifrazier. Let me test these and merge it 👍

w0www commented 7 years ago

+1!!

w0www commented 7 years ago

@scaffeinate can you test this? :P Thanks!

scaffeinate commented 7 years ago

@w0www Yes I did. But the develop branch isn't so stable. There are a number of things breaking with the new changes. So decided to fix those first before merging into master. I want the master to be stable release branch. And if I merge this one now it's gonna create conflicts when the new refactoring changes kick in. Check out this branch where I am fixing https://github.com/scaffeinate/socify/tree/feature/fix-dom

w0www commented 7 years ago

@scaffeinate When you think that there will be a new stable version with all these changes? Thanks

malachaifrazier commented 5 years ago

Closed due to inactivity