search

cthit / chalmersit-rails

Chalmers.it built with Rails
MIT License
4 stars 6 forks source link

Update some dependencies and add dev-dockerfile #345

Closed lindskogen closed 4 years ago

Portals commented 6 years ago

Why was this approved when there's merge conflicts?

hulthe commented 6 years ago

@Portals merge conflicts happen all the time, that doesn't necessarily change weather the PR in and of itself is good.

And in this case, the conflict looks to be resolvable by simply merging the develop-branch into this one, without actually changing anything.

Portals commented 6 years ago

What is the status on this @lindskogen? Should this work be resumed by someone in digIT or would you like to finish it? We need to move everything to docker before the end of this year, so we have an abundance of time.

lindskogen commented 6 years ago

@Portals I'm fine with you (or someone else) looking into resuming working on this :)