aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15856 from zuhao/refactor_activesupport_decoding_testYves Senn2014-06-221-11/+19
|\
| * Use with_parse_json_times helper in tests.Zuhao Wan2014-06-221-11/+19
* | Merge pull request #15857 from zuhao/refactor_activesupport_encoding_testYves Senn2014-06-221-14/+19
|\ \ | |/ |/|
| * Avoid hardcoded magic number in test teardown.Zuhao Wan2014-06-221-14/+19
|/
* :nail_care: wrap the tip from #15624 at 80 chars [ci skip]Zachary Scott2014-06-201-1/+2
* Merge pull request #15624 from aditya-kapoor/add-warnings-on-guidesZachary Scott2014-06-201-0/+2
|\
| * [ci skip] Add Tip for change_column_null and change_column_default in guidesAditya Kapoor2014-06-211-0/+2
* | Merge pull request #15764 from arthurnn/dependencies_name_errorMatthew Draper2014-06-213-5/+11
|\ \
| * | Add regression test for NameError#nameArthur Neves2014-06-202-2/+5
| * | Make dependencies.rb add a name to NameErrorArthur Neves2014-06-202-4/+7
|/ /
* | docs, configurations method is listed in the docs. [ci skip]Yves Senn2014-06-201-1/+0
* | Merge pull request #15809 from maurogeorge/guides-console-appYves Senn2014-06-201-0/+25
|\ \
| * | Add to guides app and helper objects on command lineMauro George2014-06-191-0/+25
* | | Merge pull request #15537 from tgxworld/fix_state_leakMatthew Draper2014-06-204-5/+5
|\ \ \
| * | | Remove redundant code.Guo Xiang Tan2014-06-051-4/+0
| * | | Prevent state leak.Guo Xiang Tan2014-06-054-1/+5
* | | | Merge pull request #15824 from bhicks/remove-extra-list-item-elementSean Griffin2014-06-191-1/+1
|\ \ \ \
| * | | | Remove extra list item elementBen Hicks2014-06-191-1/+1
|/ / / /
* | | | add both branches to the only_path conditionalAaron Patterson2014-06-191-6/+6
* | | | Merge pull request #15728 from sgrif/sg-double-save-hm-tRafael Mendonça França2014-06-193-4/+30
|\ \ \ \
| * | | | Don't save through records twiceSean Griffin2014-06-173-3/+29
* | | | | Merge pull request #15823 from yuki24/better-docmentation-for-dynamic-error-p...Rafael Mendonça França2014-06-191-1/+1
|\ \ \ \ \
| * | | | | ErrorsController shouldn't inherit ApplicationController, but ActionControlle...Yuki Nishijima2014-06-191-1/+1
* | | | | | Merge pull request #15747 from sgrif/sg-trolololol-this-is-so-brokenRafael Mendonça França2014-06-193-1/+56
|\ \ \ \ \ \
| * | | | | | Always update counter caches in memory when adding recordsSean Griffin2014-06-163-1/+56
* | | | | | | Merge pull request #15800 from sgrif/sg-column-in-calculationRafael Mendonça França2014-06-192-17/+8
|\ \ \ \ \ \ \
| * | | | | | | Don't use `Column` for type casting in Relation calculationsSean Griffin2014-06-182-17/+8
* | | | | | | | Merge pull request #15801 from sgrif/sg-column-defaultsRafael Mendonça França2014-06-191-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't use column object when calculating type cast defaultsSean Griffin2014-06-181-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #15802 from sgrif/sg-column-quotingRafael Mendonça França2014-06-193-31/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't use column object for type casting in `quoting`Sean Griffin2014-06-183-31/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #15803 from sgrif/sg-column-in-associationsRafael Mendonça França2014-06-193-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't rely on the column for type casting reflectionsSean Griffin2014-06-183-5/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #15814 from sgrif/sg-number-changedRafael Mendonça França2014-06-191-12/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Further simplify `changed?` conditional for numeric typesSean Griffin2014-06-191-12/+6
| |/ / / / / /
* | | | | | | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debugRafael Mendonça França2014-06-192-7/+7
|\ \ \ \ \ \ \
| * | | | | | | remove unnecessary substitution for space in ActionView::Helpers#debugAditya Kapoor2014-06-142-7/+7
* | | | | | | | Merge pull request #15818 from sgrif/sg-attribute-setRafael Mendonça França2014-06-198-23/+120
|\ \ \ \ \ \ \ \
| * | | | | | | | Introduce an object to aid in creation and management of `@attributes`Sean Griffin2014-06-198-23/+120
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #15808 from maurogeorge/guides-custom-errors-pageEileen M. Uchitelle2014-06-191-0/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Create custom errors page on ActionController guidesMauro George2014-06-191-0/+55
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #15820 from lucasmazza/lm-except-highlight-tweaksRafael Mendonça França2014-06-193-7/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | 'TextHelper#highlight' now accepts a block to highlight the matched words.Lucas Mazza2014-06-193-3/+30
| * | | | | | | | highlight() now accepts regular expressions as well.Jan Szumiec2014-06-192-5/+15
| * | | | | | | | excerpt() now accepts regular expression instances as phrases.Jan Szumiec2014-06-192-3/+9
* | | | | | | | | Merge pull request #15772 from nbudin/sti_through_bugRafael Mendonça França2014-06-193-1/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't include inheritance column in the through_scope_attributesNat Budin2014-06-173-2/+17
* | | | | | | | | | Use a better test descriptionRafael Mendonça França2014-06-191-1/+1
* | | | | | | | | | Fix has_and_belongs_to_many in a namespaced model pointing to a non namespace...Rafael Mendonça França2014-06-194-8/+20
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #15817 from zoombody/patch-1Rafael Mendonça França2014-06-191-1/+1
|\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 06:43:49 +0000