aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22940 from lsylvester/activemodel-depends-on-builder-but-...Matthew Draper2016-01-072-3/+0
|\
| * remove activemodel dependency on builderLachlan Sylvester2016-01-062-3/+0
|/
* Merge pull request #22939 from y-yagi/make_generated_controller_test_file_wor...Rafael França2016-01-063-1/+14
|\
| * make generated controller test work correctlyyuuji.yaginuma2016-01-063-1/+14
* | Merge pull request #22921 from prathamesh-sonpatki/fix-add-referenceRafael França2016-01-061-0/+1
|\ \
| * | Autoload ReferenceDefinition class in abstract adapter so that it can be used...Prathamesh Sonpatki2016-01-051-0/+1
* | | Merge pull request #21688 from kamipo/add_text_and_blob_shorthand_methodsRafael Mendonça França2016-01-063-10/+53
|\ \ \
| * | | Add short-hand methods for text and blob types in MySQLRyuta Kamizono2016-01-053-10/+53
| |/ /
* | | Merge pull request #22275 from mastahyeti/per-form-csrfRafael França2016-01-069-18/+253
|\ \ \
| * | | add option for per-form CSRF tokensBen Toews2016-01-049-18/+253
* | | | Merge pull request #22938 from sblackstone/masterRafael França2016-01-062-1/+17
|\ \ \ \
| * | | | Provide a better error message if a user mistypes the name of script with runnerStephen Blackstone2016-01-052-1/+17
|/ / / /
* | | | Move CHANGELOG entry to Active RecordRafael Mendonça França2016-01-052-5/+5
* | | | Merge pull request #20544 from Envek/fix_utc_offset_for_time_attributesRafael França2016-01-053-1/+9
|\ \ \ \
| * | | | Take UTC offset into account when assigning string value to time attribute.Andrey Novikov2016-01-053-1/+9
* | | | | Merge pull request #22920 from kamipo/fix_connection_createRafael França2016-01-055-9/+13
|\ \ \ \ \
| * | | | | Fix `connection#create` in PG adapterRyuta Kamizono2016-01-055-9/+13
* | | | | | Prefer inspect over escaping and sorround by quote marksSantiago Pastorino2016-01-051-3/+1
* | | | | | Add Html template handler that wraps Raw output in an OutputBufferSantiago Pastorino2016-01-055-2/+21
| |/ / / / |/| | | |
* | | | | Merge pull request #22922 from vhf/add_fpb_backClaudio B2016-01-051-0/+1
|\ \ \ \ \
| * | | | | [ci skip] Update doc/resource link removed by #21211Victor Felder2016-01-051-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22927 from jmgcrespo/jmgcrespo-patch-1Claudio B2016-01-051-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add job suffix to sample's job file nameManu2016-01-051-2/+2
|/ / / /
* | | / :scissors: Unnecessary spacing in the generated codeAkira Matsuda2016-01-051-1/+1
| |_|/ |/| |
* | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-043-5/+16
|\ \ \
| * | | Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQLRyuta Kamizono2016-01-043-5/+16
* | | | Merge pull request #22906 from bf4/rendering_exceptionsRafael França2016-01-043-88/+163
|\ \ \ \
| * | | | Group related methods togetherBenjamin Fleischer2016-01-031-67/+67
| * | | | Add ActionController:Renderers testBenjamin Fleischer2016-01-033-24/+99
* | | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-045-20/+24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | activerecord: reuse immutable objectsTamir Duberstein2016-01-044-14/+20
| * | | | activerecord: allocate fewer arrays in `RecordFetchWarning`Tamir Duberstein2016-01-041-6/+4
| | |/ / | |/| |
* | | | Merge pull request #22915 from kamipo/fix_user_name_in_docEileen M. Uchitelle2016-01-041-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix user name in doc [ci skip]Ryuta Kamizono2015-12-311-1/+1
* | | | Update the maintenance policy for the next release.Rafael Mendonça França2016-01-041-3/+3
* | | | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-042-0/+6
|\ \ \ \
| * | | | Allow add_to_transaction with null transactionEmanuel Evans2015-12-282-0/+6
* | | | | Merge pull request #22764 from stevenspiel/titleize_model_name_for_default_su...Rafael França2016-01-043-3/+43
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | downcase default submit button value's model nameSteven Spiel2016-01-013-3/+43
* | | | | Merge pull request #22890 from DNNX/times-mapSantiago Pastorino2016-01-031-1/+1
|\ \ \ \ \
| * | | | | Replace x.times.map{} with Array.new(x){}Viktar Basharymau2016-01-021-1/+1
* | | | | | Merge pull request #22904 from davydovanton/doc-typo-test-nameZachary Scott2016-01-041-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix typo in test desctiption [skip ci]Anton Davydov2016-01-041-1/+1
|/ / / / /
* | | | | Merge pull request #22901 from prathamesh-sonpatki/fix-gemfile-lockKasper Timm Hansen2016-01-031-1/+1
|\ \ \ \ \
| * | | | | Updated Gemfile.lock with latest change related to sucker_punch dependencyPrathamesh Sonpatki2016-01-031-1/+1
* | | | | | Merge pull request #22899 from y-yagi/move_changelog_entryKasper Timm Hansen2016-01-031-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-01-031-3/+2
|/ / / / /
* | | | | Merge pull request #22889 from kamipo/remove_fixme_commentsClaudio B2016-01-021-3/+0
|\ \ \ \ \
| * | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
* | | | | | Merge pull request #22891 from prathamesh-sonpatki/rm-duplicate-entry-for-cac...Claudio B2016-01-021-3/+0
|\ \ \ \ \ \