Skip to content

Conversation

@knoopx
Copy link
Contributor

@knoopx knoopx commented Oct 18, 2017

It also closes #284

Copy link
Collaborator

@sauloperez sauloperez left a comment

Choose a reason for hiding this comment

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

If Sergi gives it a decent amount of QA, including ActiveAdmin, I'm fine.

@knoopx
Copy link
Contributor Author

knoopx commented Oct 19, 2017

FYI: Couldn't boot the app at all until updating the deps.

@sauloperez
Copy link
Collaborator

really? what was the problem?

@enricostano
Copy link
Contributor

@knoopx Did you start this branch from master or develop? I ask for those merge commits.

In any case, many thanks!!!

@knoopx
Copy link
Contributor Author

knoopx commented Oct 20, 2017

@enricostano rebased from develop

@sauloperez
Copy link
Collaborator

Cool! Let's wait until Sergi tests this alongside #266 again.

* develop: (59 commits)
  Don't show useless horizontal scrollbar in destkop
  Add spec for case insensitive tag group
  Post tags list ordered case insensitive
  Enable sorting by balance in users list
  Remove commented out gem
  Move dotenv-rails to dev and test group
  Remove deprecated an unused gem
  We don't need a pretty printer as dependency
  Move rails_12factor gem to prod group as in docs
  Fix some rubocop violations
  Remove intermediate vars
  Replace give_time link from organizations#show
  Replace give_time link from users#show page
  Add specs to TransferFactory
  Refactor and doc Account#update_balance
  Add specs for Account#update_balance
  Remove dead #languages_list helper
  Fix activeadmin's deprecation warning
  Remove old TODOs
  Cleanup top-level README section
  ...
@sauloperez
Copy link
Collaborator

sauloperez commented Jan 26, 2018

I hope I've solved the merge conflicts in the Gemfile.lock correctly. Might not be the wisest thing to do on a Friday afternoon :trollface:

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.

Fetch activeadmin from Rubygems instead of git

3 participants