Eric Eastwood 3468ca835d Merge branch 'master' into ff_port_from_ee ... Conflicts: app/models/project.rb db/schema.rb		2017-09-28 16:59:49 -05:00
..
bin	…
config	…
controllers	…
db/production	…
factories	Merge branch 'hashed-storage-migration-path' into 'master'	2017-09-28 17:26:16 +00:00
features	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
finders	Support custom attributes on users	2017-09-28 16:49:42 +00:00
fixtures	Merge branch 'master' into ff_port_from_ee	2017-09-26 16:24:54 -05:00
helpers	…
initializers	…
javascripts	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
lib	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
mailers	…
migrations	…
models	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
policies	Support custom attributes on users	2017-09-28 16:49:42 +00:00
presenters	…
requests	Support custom attributes on users	2017-09-28 16:49:42 +00:00
routing	…
rubocop/cop	…
serializers	…
services	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
sidekiq/cron	…
support	Merge branch 'master' into ff_port_from_ee	2017-09-28 16:59:49 -05:00
tasks	Add support to migrate existing projects to Hashed Storage async	2017-09-28 16:32:14 +01:00
unicorn	…
uploaders	…
validators	…
views	…
workers	Add support to migrate existing projects to Hashed Storage async	2017-09-28 16:32:14 +01:00
factories_spec.rb	…
rails_helper.rb	…
rake_helper.rb	…
simplecov_env.rb	…
spec_helper.rb	…