Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | cleanup, remove trailing whitespace within actionpack | Yves Senn | 2012-10-27 | 11 | -17/+17 | |
| | | ||||||
* | | Add missing require for minitest assertions. Breaks calling 'app' in console ↵ | Jeremy Kemper | 2012-10-25 | 1 | -0/+1 | |
| | | | | | | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25. | |||||
* | | Merge pull request #8030 from calebthompson/fix-ternary | Rafael Mendonça França | 2012-10-25 | 1 | -2/+5 | |
|\ \ | | | | | | | Fix gratuitous use of ternary operator | |||||
| * | | Fix gratuitous use of ternary operator | Caleb Thompson | 2012-10-25 | 1 | -2/+5 | |
| | | | ||||||
* | | | remain backwards compatible, exception can be constructed with no arguments | Aaron Patterson | 2012-10-25 | 1 | -1/+3 | |
|/ / | ||||||
* | | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 3 | -2/+23 | |
| | | ||||||
* | | do not lose backtrace information from the raised exception | Aaron Patterson | 2012-10-25 | 2 | -14/+11 | |
| | | ||||||
* | | fix uninitialized ivar warnings | Aaron Patterson | 2012-10-25 | 1 | -0/+10 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 1 | -17/+42 | |
|\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md | |||||
| * | add a nested attributes example into Strong Parameters documentation [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -6/+31 | |
| | | ||||||
| * | remove some non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -13/+13 | |
| | | ||||||
* | | check_box value can be not only an object of Array class | Vasiliy Ermolovich | 2012-10-20 | 2 | -3/+11 | |
| | | | | | | | | there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case | |||||
* | | Add i18n scope to disance_of_time_in_words. | Steve Klabnik | 2012-10-19 | 2 | -11/+24 | |
| | | | | | | | | This fixes #733. | |||||
* | | synchronize on param filter cache. | Aaron Patterson | 2012-10-18 | 1 | -2/+7 | |
| | | | | | | | | Do we actually need this cache? | |||||
* | | add another singleton for environment filtering | Aaron Patterson | 2012-10-18 | 1 | -3/+8 | |
| | | ||||||
* | | oops, forgot the default parameter | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | | ||||||
* | | keep a singleton filter around that we can use when no filter is set | Aaron Patterson | 2012-10-18 | 1 | -2/+6 | |
| | | ||||||
* | | move compiled filters to their own class so that recursive calls don't | Aaron Patterson | 2012-10-18 | 1 | -41/+45 | |
| | | | | | | | | need to check for the length of @filters | |||||
* | | nil isn't a valid filter | Aaron Patterson | 2012-10-18 | 1 | -1/+0 | |
| | | ||||||
* | | prevent people from accidentally modifying the filter word | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | | ||||||
* | | simplify filter enabled checking | Aaron Patterson | 2012-10-18 | 1 | -9/+4 | |
| | | ||||||
* | | if no filters are supplied, default to an empty list | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | | ||||||
* | | initialize required instance variables for this mixin | Aaron Patterson | 2012-10-18 | 1 | -2/+7 | |
| | | ||||||
* | | There is already a Set of non-hidden action_names lying around. | thedarkone | 2012-10-18 | 1 | -8/+2 | |
| | | ||||||
* | | eagerly populate the http method loookup cache so we don't need locks | Aaron Patterson | 2012-10-18 | 1 | -1/+7 | |
| | | ||||||
* | | move cache inside the instance so we do not need locking | Aaron Patterson | 2012-10-18 | 1 | -9/+12 | |
| | | ||||||
* | | add test for fetch with a block | Aaron Patterson | 2012-10-18 | 2 | -2/+6 | |
| | | ||||||
* | | prefer composition over inheritence | Aaron Patterson | 2012-10-18 | 2 | -11/+31 | |
| | | ||||||
* | | Merge pull request #7975 from butcher/extend_date_select_helper_functionality | Rafael Mendonça França | 2012-10-18 | 3 | -0/+24 | |
|\ \ | | | | | | | | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md | |||||
| * | | Extend date_select helper functionality. | Pavel Nikitin | 2012-10-18 | 3 | -0/+22 | |
| | | | ||||||
* | | | Permit string and float values in the multiparameter attributes | Rafael Mendonça França | 2012-10-18 | 2 | -10/+15 | |
| | | | ||||||
* | | | Add changelog entry for precompile config | Joshua Peek | 2012-10-17 | 1 | -0/+4 | |
| | | | ||||||
* | | | Add more CHANGELOG entries from #7927 | Rafael Mendonça França | 2012-10-17 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip] | |||||
* | | | Add CHANGELOG entry for #7927 | Rafael Mendonça França | 2012-10-17 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | Removed the asset_path configuration from the guides and added an entry in the upgrading_ruby_on_rails guide [ci skip] | |||||
* | | | fix Digestor to be thread safe. | Aaron Patterson | 2012-10-17 | 1 | -8/+30 | |
| | | | | | | | | | | | | | | | Add a lock on the cache so that we don't have concurrency issues when calculating the cache. | |||||
* | | | use the tmp filesystem rather than our own thing. | Aaron Patterson | 2012-10-17 | 1 | -5/+9 | |
|/ / | ||||||
* | | Ignore asset url query string or anchor when appending extensions and ↵ | Joshua Peek | 2012-10-15 | 2 | -2/+21 | |
| | | | | | | | | computing public path | |||||
* | | Extract compute_asset_extname and allow extname to be disabled | Joshua Peek | 2012-10-15 | 2 | -13/+30 | |
| | | ||||||
* | | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 3 | -11/+5 | |
|\ \ | | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | |||||
| * \ | Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -4/+0 | |
| |\ \ | | | | | | | | | Removed useless "extend SanitizeHelper::ClassMethods" | |||||
| | * | | Removed useless "extend SanitizeHelper::ClassMethods" | Andrey Samsonov | 2012-10-15 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | Since SanitizeHelper includes ActiveSupport::Concern, extending of it ClassMethods is no needed. | |||||
| * | | | Minor cleanup, helper method was only used once | Ayrton De Craene | 2012-10-15 | 1 | -5/+1 | |
| |/ / | ||||||
| * | | remove 'then' from conditional statement | Nihad Abbasov | 2012-10-14 | 1 | -2/+4 | |
| | | | ||||||
* | | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 7 | -246/+2 | |
| | | | ||||||
* | | | merge! default asset tag options | Joshua Peek | 2012-10-15 | 1 | -12/+12 | |
| | | | ||||||
* | | | Just check request instead of controller.request | Joshua Peek | 2012-10-15 | 1 | -13/+2 | |
| | | | ||||||
* | | | Allow asset url config to be undefined | Joshua Peek | 2012-10-13 | 2 | -2/+45 | |
| | | | ||||||
* | | | Add a few more compute_asset_path tests | Joshua Peek | 2012-10-13 | 1 | -0/+8 | |
| | | | ||||||
* | | | All asset url helpers should pass options | Joshua Peek | 2012-10-12 | 1 | -24/+24 | |
| | | | ||||||
* | | | JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymore | Joshua Peek | 2012-10-12 | 1 | -28/+0 | |
| | | |