aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17722 from yui-knk/fix/callbacks_commentZachary Scott2014-11-221-1/+1
|\
| * [ci skip] Fix comment of ActionDispatch::Callbacksyui-knk2014-11-231-1/+1
|/
* [ci skip] Dispatching is a verb :bow:Zachary Scott2014-11-221-1/+1
* Merge pull request #17719 from yui-knk/fix/rails_on_rack_guideZachary Scott2014-11-221-1/+1
|\
| * Fix explanation for ActionDispatch::Callbacks.yui-knk2014-11-231-1/+1
* | Merge pull request #17718 from arthurnn/fixes_16928Zachary Scott2014-11-222-1/+7
|\ \ | |/ |/|
| * Update reflections public API docArthur Neves2014-11-221-1/+1
| * Add changelog entry for .reflections API changeArthur Neves2014-11-221-0/+6
|/
* Fix build failuresSean Griffin2014-11-221-1/+3
* Rename the primary key index when renaming a table in pgSean Griffin2014-11-223-0/+43
* Remove outdated comments [ci skip]Godfrey Chan2014-11-221-6/+0
* Merge pull request #17716 from javiervidal/fixing_documentationArun Agrawal2014-11-221-1/+1
|\
| * Fixing wrong link in 'Ruby on Rails Security Guide' [ci skip]Javier Vidal2014-11-221-1/+1
|/
* Merge pull request #17712 from y-yagi/correct_postgres_guideArun Agrawal2014-11-221-2/+2
|\
| * [ci skip] correct example output and filename in pg guideyuuji.yaginuma2014-11-221-2/+2
|/
* ConnectionAdapter#substitute_at is technically public API...Sean Griffin2014-11-211-1/+1
* Merge pull request #17705 from fgo/patch-14Arthur Nogueira Neves2014-11-211-2/+2
|\
| * Move 'the' outside of SQLite and Bundler link text [ci skip]Francis Go2014-11-221-2/+2
* | Merge pull request #17702 from tgxworld/fix_select_tag_include_blank_falseSantiago Pastorino2014-11-212-1/+9
|\ \
| * | Fix select_tag generating tag when set to false.Guo Xiang Tan2014-11-212-1/+9
* | | make it possible to access fixtures excluded by a `default_scope`.Yves Senn2014-11-214-1/+24
* | | Merge pull request #17704 from fgo/patch-13Abdelkader Boudih2014-11-211-2/+2
|\ \ \ | |_|/ |/| |
| * | Update grammar in Getting Started Guide [ci skip]Francis Go2014-11-211-2/+2
|/ /
* | Merge pull request #17695 from claudiob/replace-all-backticks-with-plusesYves Senn2014-11-217-12/+12
|\ \ | |/ |/|
| * Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-207-12/+12
* | ignore all logfiles but keep the log directory. #17700 [ci skip]Yves Senn2014-11-211-1/+2
* | Merge pull request #17700 from ShunsukeAida/ignore_log_as_a_wholeYves Senn2014-11-212-1/+6
|\ \
| * | if you want to ignore all the logfiles, no need for extensionsShunsuke Aida2014-11-211-1/+1
| |/
* / raise a better exception for renaming long indexesAaron Patterson2014-11-203-0/+20
|/
* Merge pull request #17694 from claudiob/remove-backticks-from-sdocXavier Noria2014-11-201-3/+3
|\
| * Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-201-3/+3
|/
* Merge pull request #17688 from ilyakatz/request_method_instrumentationRafael Mendonça França2014-11-201-1/+1
|\
| * Use request method instead of ActionDispatch::Request#request_method instead ...Ilya Katz2014-11-201-1/+1
* | Merge pull request #17685 from claudiob/document-form-for-extra-optionsRafael Mendonça França2014-11-201-0/+15
|\ \
| * | Document *all* the options accepted by form_forclaudiob2014-11-201-0/+15
| |/
* | Merge pull request #17692 from robertomiranda/patch-1Rafael Mendonça França2014-11-201-5/+0
|\ \
| * | _will_change! method is not needed any more [ci skip]Roberto Miranda2014-11-201-5/+0
| |/
* | Merge pull request #17690 from claudiob/add-enforce-utf8-to-form-forRafael Mendonça França2014-11-203-3/+43
|\ \ | |/ |/|
| * Add `:enforce_utf8` option to form_forclaudiob2014-11-203-3/+43
|/
* Merge pull request #17683 from tgxworld/improvements_to_active_job_guideRafael Mendonça França2014-11-201-10/+12
|\
| * [CI SKIP] Improvements to Active Job guide.Guo Xiang Tan2014-11-201-10/+12
* | Merge pull request #17669 from SamSaffron/optimise_memorySean Griffin2014-11-201-1/+6
|\ \
| * | PERF: avoid string allocationsSam2014-11-201-1/+6
* | | synchronize code and docs for `timestamps` and `add_timestamps`.Yves Senn2014-11-206-10/+22
| |/ |/|
* | Some valid block calls in templates caused syntax errorsAkira Matsuda2014-11-203-2/+7
* | Merge pull request #17575 from shikshachauhan/make-habtm-consistentRafael Mendonça França2014-11-192-1/+11
|\ \
| * | Allow habtm class_name option to be consistent with other associationsshiksha2014-11-132-1/+11
* | | Fix shell quote on the release taskRafael Mendonça França2014-11-191-1/+1
* | | Reintroduce cache with testsSean Griffin2014-11-193-14/+56
* | | Add tests for `TypeMap#fetch` and push up to `TypeMap`Sean Griffin2014-11-193-5/+20