config
|
Revert "Fix merge conflicts - squashed commit"
|
2016-06-03 11:10:17 +02:00 |
controllers
|
Merge branch 'master' into workhorse-helpers
|
2016-06-10 12:28:04 +02:00 |
finders
|
Revert "Fix merge conflicts - squashed commit"
|
2016-06-03 11:10:17 +02:00 |
fixtures
|
Set target="_blank" for external links
|
2016-06-08 13:07:20 -05:00 |
initializers
|
Add tests for setting trusted_proxies
|
2016-05-04 15:49:39 -07:00 |
lib
|
fix merge
|
2016-06-14 10:20:47 +02:00 |
mailers
|
Revert "Fix merge conflicts - squashed commit"
|
2016-06-03 11:10:17 +02:00 |
routing
|
Revert "Fix merge conflicts - squashed commit"
|
2016-06-03 11:10:17 +02:00 |
spec_helper.rb
|
Enable Knapsack only in CI environment
|
2016-06-08 11:43:13 +02:00 |