aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #20931 from eliotsykes/force_ssl-docs-options-formattingKasper Timm Hansen2015-07-191-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix formatting of force_ssl options documentation [ci skip]Eliot Sykes2015-07-191-6/+6
|/ / / / / / /
* | | | | | | Merge pull request #20924 from andrii/masterAbdelkader Boudih2015-07-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix typo in #any? RDocAndrii Ponomarov2015-07-171-1/+1
* | | | | | | | Merge pull request #20839 from TheBlasfem/added_examples_dateandtime_calculat...Sean Griffin2015-07-181-9/+34
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | added examples to DateAndTime::Calculations [ci skip]Julio Lopez2015-07-181-9/+34
* | | | | | | | Merge pull request #20932 from twalpole/collection_association_parametersSean Griffin2015-07-182-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure that 'ActionController::Parameters' can still be passed to AR for coll...Thomas Walpole2015-07-182-1/+19
* | | | | | | | | Ensure cyclic associations w/ autosave don't cause duplicate errorsSean Griffin2015-07-185-0/+37
|/ / / / / / / /
* | | | | | | | Merge pull request #20763 from maurogeorge/default_scope_create-docSean Griffin2015-07-181-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a note about default_scope and create recordsMauro George2015-07-161-0/+12
* | | | | | | | | Ensure that `ActionController::Parameters` can still be passed to ARSean Griffin2015-07-183-0/+33
* | | | | | | | | Merge pull request #20930 from prathamesh-sonpatki/rm-render-textSean Griffin2015-07-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replaced render :text with render :plain in AC gem bug report templatePrathamesh Sonpatki2015-07-181-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20929 from y-yagi/fix_deprecated_warningKasper Timm Hansen2015-07-181-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | use `plain` option instead of deprecated `text` optionyuuji.yaginuma2015-07-181-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #20923 from sikachu/silence-render-text-warningMatthew Draper2015-07-1841-245/+247
|\ \ \ \ \ \ \ \
| * | | | | | | | Stop using deprecated `render :text` in testPrem Sichanugrist2015-07-1741-245/+247
|/ / / / / / / /
* | | | | | | | Merge pull request #20917 from sikachu/ps-deprecate-render-textJeremy Daer (Kemper)2015-07-172-11/+56
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add deprecation warning for `render :text`Prem Sichanugrist2015-07-172-11/+56
* | | | | | | | push fields_for_style? in to a protected methodAaron Patterson2015-07-171-5/+5
* | | | | | | | Merge pull request #20902 from sikachu/silence-association-reload-warningSean Griffin2015-07-1710-105/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | Silence deprecation warning from force reloadPrem Sichanugrist2015-07-1610-105/+125
* | | | | | | | | push is_a checks up the stackAaron Patterson2015-07-171-13/+13
* | | | | | | | | remove useless conditionalAaron Patterson2015-07-171-1/+0
* | | | | | | | | Merge pull request #20125Sean Griffin2015-07-173-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ActiveSupport::HashWithIndifferentAccess select and reject should return enum...Bernard Potocki2015-07-173-0/+19
|/ / / / / / / / /
* | | | | | | | | remove useless conditionalsAaron Patterson2015-07-171-2/+2
* | | | | | | | | remove useless functionAaron Patterson2015-07-171-8/+2
* | | | | | | | | stop passing `params` to `array_of_permitted_scalars_filter`Aaron Patterson2015-07-171-4/+6
* | | | | | | | | push key checking upAaron Patterson2015-07-171-1/+2
* | | | | | | | | Merge pull request #20918 from jonatack/fix-lookup-grammarRafael Mendonça França2015-07-177-14/+17
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | [skip ci] Lookup can be a noun but it is not a verbJon Atack2015-07-177-14/+17
|/ / / / / / / /
* | | | | | | | Merge pull request #20915 from robin850/jruby-skipsSean Griffin2015-07-173-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Skip a few failing tests on JRuby with the attached ticketsRobin Dupret2015-07-173-0/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #20909 from yui-knk/fix/test-commnadClaudio B.2015-07-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Add `bundle exec` to test run commandyui-knk2015-07-171-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #20905 from imtayadeway/tw/fix-db-pooling-docsClaudio B.2015-07-171-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | [skip ci] Improve grammar/style in DB pooling guide.Tim Wade2015-07-161-7/+7
| |/ / / / / / /
* | | | | | | | Oops! :bomb:Akira Matsuda2015-07-171-1/+1
* | | | | | | | "warning: instance variable @routes not initialized"Akira Matsuda2015-07-171-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #20892 from zoltankiss/make-params-method-returns-consistentRafael Mendonça França2015-07-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Standardize `ActionController::Parameters#to_unsafe_h` return valueZoltan Kiss2015-07-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #20888 from sikachu/remove-support-for-force-reloadRafael Mendonça França2015-07-159-0/+70
|\ \ \ \ \ \
| * | | | | | Deprecate force association reload by passing truePrem Sichanugrist2015-07-159-0/+70
* | | | | | | Merge pull request #20868 from sikachu/params-not-inherited-from-hwiaRafael Mendonça França2015-07-1510-38/+167
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update documentation on `AC::Parameters`Prem Sichanugrist2015-07-152-7/+33
| * | | | | | Make AC::Parameters not inherited from HashPrem Sichanugrist2015-07-1510-35/+138
* | | | | | | Merge pull request #20887 from tgxworld/ar_callbacksRafael Mendonça França2015-07-158-23/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Revert "Reduce allocations when running AR callbacks.""Guo Xiang Tan2015-07-168-23/+32
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:53:21 +0000