Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Fix `TimeWithZone#eql?` to handle `TimeWithZone` created from `DateTime` | Roque Pinel | 2015-07-19 | 3 | -1/+13 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #20931 from eliotsykes/force_ssl-docs-options-formatting | Kasper Timm Hansen | 2015-07-19 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix formatting of force_ssl options documentation [ci skip] | Eliot Sykes | 2015-07-19 | 1 | -6/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20924 from andrii/master | Abdelkader Boudih | 2015-07-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Fix typo in #any? RDoc | Andrii Ponomarov | 2015-07-17 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #20839 from TheBlasfem/added_examples_dateandtime_calculat... | Sean Griffin | 2015-07-18 | 1 | -9/+34 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | added examples to DateAndTime::Calculations [ci skip] | Julio Lopez | 2015-07-18 | 1 | -9/+34 | |
* | | | | | | | | Merge pull request #20932 from twalpole/collection_association_parameters | Sean Griffin | 2015-07-18 | 2 | -1/+19 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Ensure that 'ActionController::Parameters' can still be passed to AR for coll... | Thomas Walpole | 2015-07-18 | 2 | -1/+19 | |
* | | | | | | | | | Ensure cyclic associations w/ autosave don't cause duplicate errors | Sean Griffin | 2015-07-18 | 5 | -0/+37 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20763 from maurogeorge/default_scope_create-doc | Sean Griffin | 2015-07-18 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add a note about default_scope and create records | Mauro George | 2015-07-16 | 1 | -0/+12 | |
* | | | | | | | | | Ensure that `ActionController::Parameters` can still be passed to AR | Sean Griffin | 2015-07-18 | 3 | -0/+33 | |
* | | | | | | | | | Merge pull request #20930 from prathamesh-sonpatki/rm-render-text | Sean Griffin | 2015-07-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Replaced render :text with render :plain in AC gem bug report template | Prathamesh Sonpatki | 2015-07-18 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #20929 from y-yagi/fix_deprecated_warning | Kasper Timm Hansen | 2015-07-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | use `plain` option instead of deprecated `text` option | yuuji.yaginuma | 2015-07-18 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20923 from sikachu/silence-render-text-warning | Matthew Draper | 2015-07-18 | 41 | -245/+247 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Stop using deprecated `render :text` in test | Prem Sichanugrist | 2015-07-17 | 41 | -245/+247 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20917 from sikachu/ps-deprecate-render-text | Jeremy Daer (Kemper) | 2015-07-17 | 2 | -11/+56 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add deprecation warning for `render :text` | Prem Sichanugrist | 2015-07-17 | 2 | -11/+56 | |
* | | | | | | | | push fields_for_style? in to a protected method | Aaron Patterson | 2015-07-17 | 1 | -5/+5 | |
* | | | | | | | | Merge pull request #20902 from sikachu/silence-association-reload-warning | Sean Griffin | 2015-07-17 | 10 | -105/+125 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Silence deprecation warning from force reload | Prem Sichanugrist | 2015-07-16 | 10 | -105/+125 | |
* | | | | | | | | | push is_a checks up the stack | Aaron Patterson | 2015-07-17 | 1 | -13/+13 | |
* | | | | | | | | | remove useless conditional | Aaron Patterson | 2015-07-17 | 1 | -1/+0 | |
* | | | | | | | | | Merge pull request #20125 | Sean Griffin | 2015-07-17 | 3 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ActiveSupport::HashWithIndifferentAccess select and reject should return enum... | Bernard Potocki | 2015-07-17 | 3 | -0/+19 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | remove useless conditionals | Aaron Patterson | 2015-07-17 | 1 | -2/+2 | |
* | | | | | | | | | remove useless function | Aaron Patterson | 2015-07-17 | 1 | -8/+2 | |
* | | | | | | | | | stop passing `params` to `array_of_permitted_scalars_filter` | Aaron Patterson | 2015-07-17 | 1 | -4/+6 | |
* | | | | | | | | | push key checking up | Aaron Patterson | 2015-07-17 | 1 | -1/+2 | |
* | | | | | | | | | Merge pull request #20918 from jonatack/fix-lookup-grammar | Rafael Mendonça França | 2015-07-17 | 7 | -14/+17 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [skip ci] Lookup can be a noun but it is not a verb | Jon Atack | 2015-07-17 | 7 | -14/+17 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20915 from robin850/jruby-skips | Sean Griffin | 2015-07-17 | 3 | -0/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Skip a few failing tests on JRuby with the attached tickets | Robin Dupret | 2015-07-17 | 3 | -0/+8 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20909 from yui-knk/fix/test-commnad | Claudio B. | 2015-07-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] Add `bundle exec` to test run command | yui-knk | 2015-07-17 | 1 | -1/+1 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #20905 from imtayadeway/tw/fix-db-pooling-docs | Claudio B. | 2015-07-17 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [skip ci] Improve grammar/style in DB pooling guide. | Tim Wade | 2015-07-16 | 1 | -7/+7 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Oops! :bomb: | Akira Matsuda | 2015-07-17 | 1 | -1/+1 | |
* | | | | | | | | "warning: instance variable @routes not initialized" | Akira Matsuda | 2015-07-17 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20892 from zoltankiss/make-params-method-returns-consistent | Rafael Mendonça França | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Standardize `ActionController::Parameters#to_unsafe_h` return value | Zoltan Kiss | 2015-07-15 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20888 from sikachu/remove-support-for-force-reload | Rafael Mendonça França | 2015-07-15 | 9 | -0/+70 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Deprecate force association reload by passing true | Prem Sichanugrist | 2015-07-15 | 9 | -0/+70 | |
* | | | | | | | Merge pull request #20868 from sikachu/params-not-inherited-from-hwia | Rafael Mendonça França | 2015-07-15 | 10 | -38/+167 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Update documentation on `AC::Parameters` | Prem Sichanugrist | 2015-07-15 | 2 | -7/+33 | |
| * | | | | | | Make AC::Parameters not inherited from Hash | Prem Sichanugrist | 2015-07-15 | 10 | -35/+138 | |
* | | | | | | | Merge pull request #20887 from tgxworld/ar_callbacks | Rafael Mendonça França | 2015-07-15 | 8 | -23/+32 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | |