aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| |\ \ \ \
| | * | | | Process sub-query relation's binding valuesPaul Nikitochkin2013-10-204-4/+54
| * | | | | Escape the parentheses in the default function regexpRafael Mendonça França2013-10-212-1/+6
| * | | | | Merge pull request #12567 from GoBoundless/fix_postgres_structure_importYves Senn2013-10-213-1/+13
| |\ \ \ \ \
| | * | | | | Fix loading a sql structure file on postgres when the file's path has whitesp...Kevin Mook2013-10-213-1/+13
| * | | | | | Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline-docsGuillermo Iguaran2013-10-211-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update docs on Tilt::Template in Asset Pipeline guideDavid Verhasselt2013-10-211-3/+8
| |/ / / / /
| * | | | | remove trailing whitespace added with b057765 [ci skip].Yves Senn2013-10-211-2/+2
| * | | | | Merge pull request #12565 from stormsilver/unscope_fixesYves Senn2013-10-213-7/+23
| |\ \ \ \ \
| | * | | | | Allow unscope to work with `where.not`Eric Hankins2013-10-213-7/+23
| |/ / / / /
| * | | | | Merge pull request #12549 from makimoto/raise-when-find-without-pkYves Senn2013-10-213-0/+13
| |\ \ \ \ \
| | * | | | | Raise an exception when model without primary key calls .find_with_idsShimpei Makimoto2013-10-213-0/+13
| |/ / / / /
| * | | | | Merge pull request #12591 from vipulnsward/remove_mail_mergeYves Senn2013-10-201-3/+3
| |\ \ \ \ \
| | * | | | | Remove extra variable creation and merge.Vipul A M2013-10-201-3/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #12556 from dasch/dasch/nstrument-am-processingJosé Valim2013-10-204-7/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Instrument the generation of Action Mailer messagesDaniel Schierbeck2013-10-204-7/+29
| |/ / / /
| * | | | Merge pull request #12533 from szimek/use_exists_in_relation_emptySantiago Pastorino2013-10-192-2/+5
| |\ \ \ \ | | |/ / / | |/| | |