diff --git a/.gitignore b/.gitignore index bd7da4d2d..c3f1dd98e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ /public/uploads /public/assets +/public/api # Ignore application configurations /config/application.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index d4d8d2cbc..1cb13089e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ ## next release -- add json cache for machines, events, trainings -- optimise sql query, avoid to N+1 -- fix some reservations was referencing reservable not present in database -[TODO DEPLOY] run `bundle exec rake fablab:fix:reservations_not_existing_reservable` to fix it +- Add json cache for machines, events, trainings +- Optimise sql query, avoid to N+1 +- Fix a bug: some reservations was referencing reservable not present in database (#patch) +- [TODO DEPLOY] `bundle exec rake fablab:fix:reservations_not_existing_reservable` to apply #patch +- [TODO DEPLOY] `bundle install` and `rake db:migrate` ## v2.2.2 2016 June 23 - Fix some bugs: users with uncompleted account (sso imported) won't appear in statistics, in listings and in searches. Moreover, they won't block statistics generation diff --git a/db/schema.rb b/db/schema.rb index 470636d5b..90d0dc0d7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160526102307) do +ActiveRecord::Schema.define(version: 20160613093842) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql"