aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | [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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-192-2/+5
| |/ / /
| * | | Merge pull request #12560 from sue445/modify_find_lock_sample_codeYves Senn2013-10-181-3/+3
| |\ \ \
| | * | | [ci skip] avoid deprecation warning in sample codesue4452013-10-181-3/+3
| * | | | Merge pull request #11839 from chocoby/fix/convert_port_numberYves Senn2013-10-183-1/+15
| |\ \ \ \
| | * | | | Convert Fixnum into String the port number in MySQLKenta Okamoto2013-10-183-1/+15
| |/ / / /
| * | | | Merge pull request #12569 from arthurnn/autosave_small_cleanipRafael Mendonça França2013-10-171-196/+196
| |\ \ \ \
| | * | | | Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| | * | | | Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| * | | | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docsYves Senn2013-10-171-1/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add Sass gobbling info to asset pipeline docsDavid Verhasselt2013-10-171-1/+5
| * | | | | Merge pull request #12564 from JuanitoFatas/association-basicsYves Senn2013-10-161-8/+8
| |\ \ \ \ \
| | * | | | | [ci skip] Fix number of methods added by association.Juanito Fatas2013-10-171-8/+8
| * | | | | | Ensure the state is clean after one failureRafael Mendonça França2013-10-161-5/+4
| * | | | | | Merge pull request #12540 from wyaeld/bug/fix-recursive-digestRafael Mendonça França2013-10-163-6/+37
| |\ \ \ \ \ \
| | * | | | | | add a new local variable to track if digests are being stored, to ensure the ...Brad Murray2013-10-171-2/+2
| | * | | | | | update digestor code based on reviewBrad Murray2013-10-151-2/+2
| | * | | | | | update changelogBrad Murray2013-10-151-0/+5
| | * | | | | | Ensure ActionView::Digest.cache is correctly cleaned up whenBrad Murray2013-10-151-6/+6