rgarcia dde1d34172 fixes conflicts with master

2017-01-05 01:56:35 +01:00

..

controllers

Fixes issue in has_orders concern

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

features

fixes conflicts with master

2017-01-05 01:56:35 +01:00

helpers

Merge branch 'master' into budgets

2017-01-02 12:10:23 +01:00

lib

Merge branch 'master' into budget

2016-11-28 11:41:49 +01:00

mailers

Store locale in a user's field and switch locale on mailers

2016-01-22 18:10:28 +01:00

models

Merge branch 'master' into budgets

2017-01-02 12:10:23 +01:00

support

Removes unused common actions

2016-12-25 12:57:57 +01:00

customization_engine_spec.rb

tries to fix flacky spec 'change my credentials'

2016-11-15 11:24:59 +01:00

factories.rb

Adds sanitized descriptions for all phases to budget model

2017-01-01 12:51:17 +01:00

i18n_spec.rb

Adds i18n-tasks

2015-08-06 18:31:26 +02:00

rails_helper.rb

disables js fx in specs via poltergeist config

2016-03-04 12:26:47 +01:00

spec_helper.rb

removes custom knapsack configuration

2016-11-20 11:58:31 +01:00