aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #12642 from ka8725/fix_usage_for_model_generatorsRafael Mendonça França2013-10-251-1/+1
|\ \ \ \ \ \
| * | | | | | Improve usage example for model generatorAndrey Koleshko2013-10-251-1/+1
* | | | | | | Merge pull request #12641 from jetthoughts/12640_updated_migrations_doc_to_us...Rafael Mendonça França2013-10-251-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix migration docs to use new remove_column semanticsPaul Nikitochkin2013-10-251-2/+2
* | | | | | | Merge pull request #12490 from senny/store_accessor_hstore_bugYves Senn2013-10-248-14/+127
|\ \ \ \ \ \ \
| * | | | | | | `ActiveRecord::Store` works together with PG `hstore` columns.Yves Senn2013-10-256-14/+88
| * | | | | | | `stored_attributes` need to be specific to a subclass.Yves Senn2013-10-253-0/+21
| * | | | | | | test to verify the `ActiveRecord::Store` behavior with PG's json typeYves Senn2013-10-251-0/+18
|/ / / / / / /
* | | | | | | Merge pull request #12621 from laurocaetano/fix_has_one_association_with_prim...Rafael Mendonça França2013-10-243-1/+24
|\ \ \ \ \ \ \
| * | | | | | | Save association when primary key is manually setlaurocaetano2013-10-243-1/+24
* | | | | | | | Merge pull request #12636 from kongregate/dont_rescue_ExceptionsRafael Mendonça França2013-10-241-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid unnecessary catching of Exception instead of StandardError (converting ...stopdropandrew2013-10-241-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Improve the test code for #8422Rafael Mendonça França2013-10-241-4/+4
* | | | | | | | Merge pull request #8491 from igagnidz/masterRafael Mendonça França2013-10-241-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Added test to ensure that DescendantsTracker does not leak memory on singleto...Iuri Gagnidze2012-12-091-0/+10
* | | | | | | | | Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methodsAaron Patterson2013-10-241-6/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | always check to see if methods exist after calling define_attribute_methodsMatt Jones2013-10-241-6/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Add CHANGELOG entry for #12635 [ci skip]Rafael Mendonça França2013-10-241-0/+4
* | | | | | | | | Merge pull request #12635 from mperham/4-0-stableGuillermo Iguaran2013-10-241-1/+0
* | | | | | | | | Merge pull request #10471 from andyw8/button_to_paramsRafael Mendonça França2013-10-243-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add params option for button_toAndy Waite2013-09-183-0/+19
* | | | | | | | | | Merge pull request #12611 from antonio/slice_bang_honor_default_procRafael Mendonça França2013-10-243-0/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | slice! should not remove default hash value/procAntonio Santos2013-10-243-0/+24
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2013-10-241-10/+9
* | | | | | | | | | Merge pull request #12624 from timsly/masterRafael Mendonça França2013-10-241-0/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | update CHANGELOGTima Maslyuchenko2013-10-241-0/+16
| |/ / / / / / / /
* | | | | | | | | Merge pull request #12629 from Peeja/has_many-pets-typoGuillermo Iguaran2013-10-241-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix typo: `has_many :pets`, not `pets :has_many`.Peter Jaros2013-10-241-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #12622 from timsly/helpers-from-outsideGuillermo Iguaran2013-10-232-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | pass app config to controller helper proxyTima Maslyuchenko2013-10-242-1/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #12619 from Veraticus/fix_utils_normalize_pathRafael Mendonça França2013-10-232-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct error in Utils.normalize_path that changed paths improperlyJosh Symonds2013-10-232-1/+9
* | | | | | | | | Fix the install taskRafael Mendonça França2013-10-231-9/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #12617 from skv-headless/masterRafael Mendonça França2013-10-231-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] second parameter of asset-url is depricatedEvgeniy2013-10-231-4/+3
* | | | | | | | | Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_time_range...Rafael Mendonça França2013-10-233-6/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Let validates_inclusion_of accept Time and DateTime rangesAkira Matsuda2013-10-233-6/+34
|/ / / / / / / /
* | | | / / / / Try arel masterRafael Mendonça França2013-10-221-0/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | this should be private, no other instances of Root should call itAaron Patterson2013-10-221-1/+1
* | | | | | | do not search through the keys array twiceAaron Patterson2013-10-221-2/+3
* | | | | | | use the provided block to filter listsAaron Patterson2013-10-221-11/+5
* | | | | | | stop using `send` so that method privacy is respected and we get a smallAaron Patterson2013-10-221-7/+7
* | | | | | | Fix order dependent testsRafael Mendonça França2013-10-221-4/+4
* | | | | | | Merge pull request #12606 from robin850/apps-with-spacesYves Senn2013-10-224-2/+20
|\ \ \ \ \ \ \
| * | | | | | | Make the application name snake cased when it contains spacesRobin Dupret2013-10-224-2/+20
|/ / / / / / /
* | | | | | | minor Active Record CHANGELOG cleanup. [ci skip].Yves Senn2013-10-221-3/+3
* | | | | | | move helper class to the topAaron Patterson2013-10-211-42/+42
* | | | | | | build the association graph functionallyAaron Patterson2013-10-213-20/+13
* | | | | | | Merge branch 'master' into joindepAaron Patterson2013-10-2126-244/+418
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sqlRafael Mendonça França2013-10-214-6/+56
| |\ \ \ \ \ \ \