Commit cd44ad814be8931a01b37a9c83585ebe39d39674

Authored by Cyril Mougel
2 parents eb962a3f fa32e8f0
Exists in master and in 1 other branch production

Merge branch 'master' into mongoid-3

Conflicts:
	CONTRIBUTORS.md
@@ -9,13 +9,19 @@ @@ -9,13 +9,19 @@
9 9
10 ## 0.2.1 - Not released Yet 10 ## 0.2.1 - Not released Yet
11 11
  12 +### Improvements
  13 +
  14 +- [#552][] Limite size of asset on errbit ([@tscolari][])
  15 +
12 ### Bug Fixes 16 ### Bug Fixes
13 17
14 - [#558][] Avoid failure if you remote bitbucket_rest_api gem 18 - [#558][] Avoid failure if you remote bitbucket_rest_api gem
15 ([@shingara][]) 19 ([@shingara][])
16 20
17 [@shingara]: https://github.com/shingara 21 [@shingara]: https://github.com/shingara
  22 +[@tscolari]: https://github.com/tscolari
18 23
  24 +[#552]: https://github.com/errbit/errbit/issues/552
19 [#558]: https://github.com/errbit/errbit/issues/558 25 [#558]: https://github.com/errbit/errbit/issues/558
20 26
21 ## 0.2.0 - 2013-09-11 27 ## 0.2.0 - 2013-09-11
CONTRIBUTORS.md
@@ -3,6 +3,17 @@ @@ -3,6 +3,17 @@
3 - [@arthurnn][] 3 - [@arthurnn][]
4 - [@shingara][] 4 - [@shingara][]
5 5
  6 +[@shingara]: https://github.com/shingara
  7 +[@arthurnn]: https://github.com/arthurnn
  8 +
  9 +## 0.2.1 - Not released yet
  10 +
  11 +- [@shingara][]
  12 +- [@tscolari][]
  13 +
  14 +[@shingara]: https://github.com/shingara
  15 +[@tscolari]: https://github.com/tscolari
  16 +
6 ## 0.2.0 - 2013-09-11 17 ## 0.2.0 - 2013-09-11
7 18
8 - [@2called-chaos][] 19 - [@2called-chaos][]
1 # This file is used by Rack-based servers to start the application. 1 # This file is used by Rack-based servers to start the application.
2 2
3 require ::File.expand_path('../config/environment', __FILE__) 3 require ::File.expand_path('../config/environment', __FILE__)
  4 +use Rack::Deflater
4 run Errbit::Application 5 run Errbit::Application
config/environments/production.rb
@@ -59,5 +59,6 @@ Errbit::Application.configure do @@ -59,5 +59,6 @@ Errbit::Application.configure do
59 59
60 # Send deprecation notices to registered listeners 60 # Send deprecation notices to registered listeners
61 config.active_support.deprecation = :notify 61 config.active_support.deprecation = :notify
  62 + config.static_cache_control = "public, max-age=7200"
62 end 63 end
63 64