aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #22956 from prathamesh-sonpatki/rm-splat-warningKasper Timm Hansen2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove splat operator warning from ssl_testPrathamesh Sonpatki2016-01-071-1/+1
* | | | | | | | | | | | | | Merge pull request #22949 from schneems/schneems/request-idDavid Heinemeier Hansson2016-01-072-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Default new apps to tag logs with `request_id`schneems2016-01-062-1/+19
* | | | | | | | | | | | | | Merge pull request #22903 from prathamesh-sonpatki/allow-ac-parameters-hash-a...Rafael França2016-01-073-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allow AC::Parameters as an argument to url_helpersPrathamesh Sonpatki2016-01-073-2/+40
* | | | | | | | | | | | | | | Merge pull request #22954 from yui-knk/suppress_warning_on_action_viewRafael França2016-01-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Suppress warning (instance variable @persisted not initialized)yui-knk2016-01-071-0/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #22952 from Baron-burton/contributing_documentationRafael França2016-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Typo in Contributing.md documentationBaron-burton2016-01-061-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #22948 from kamipo/remove_delete_sql_in_sqlite3_adapterRafael França2016-01-061-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove `delete_sql` in sqlite3 adapterRyuta Kamizono2016-01-071-5/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #22945 from kamipo/refactor_connection_insert_sqlRafael França2016-01-064-35/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor `connection.insert_sql`Ryuta Kamizono2016-01-074-35/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #22933 from schneems/schneems/fix-broadcastRichard Schneeman2016-01-066-50/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove unused instance variableschneems2016-01-061-1/+0
| * | | | | | | | | | | | | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-064-7/+29
| * | | | | | | | | | | | | Revert "Add Logger option to disable message broadcasts"schneems2016-01-053-45/+22
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #22941 from lsylvester/pg-remove-index-legacyMatthew Draper2016-01-072-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix remove_index for postgresql when running legacy migrationsLachlan Sylvester2016-01-062-2/+19
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |