Alberto Miedes Garcés 5d9054d284 Merge branch 'master' into api-dev-PRs ...

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb

2017-05-11 21:59:42 +02:00

..

admin/api

adds budget investments numbers and chart on admin stats

2017-04-25 16:46:20 +02:00

concerns

Fixes issue in has_orders concern

2016-12-25 22:58:21 +01:00

management

managers can login to /management

2016-05-10 19:10:02 +02:00

users

fixes specs

2016-01-21 18:02:08 +01:00

debates_controller_spec.rb

fixes build

2016-07-11 10:43:27 +02:00

graphql_controller_spec.rb

Fix bug when parsing query variables sent by the GraphiQL desktop client

2017-01-31 13:52:25 +01:00

pages_controller_spec.rb

changes more information to more info

2017-04-04 18:01:30 +02:00