aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18956 from hjoo/time_optionEileen M. Uchitelle2015-02-183-6/+34
|\
| * Add `time` option to `#touch`Hyonjee Joo2015-02-183-6/+34
* | Try only to decode stringsRafael Mendonça França2015-02-181-2/+4
* | Merge pull request #18917 from lautis/non-string-csrf-tokenRafael Mendonça França2015-02-183-1/+13
|\ \
| * | Handle non-string authenticity tokensVille Lautanala2015-02-123-1/+13
* | | Merge pull request #18411 from todd/extract_record_tag_helperRafael Mendonça França2015-02-185-263/+22
|\ \ \
| * | | Remove RecordTagHelper, add extraction noticesTodd Bealmear2015-02-165-263/+22
* | | | Merge pull request #18393 from y-yagi/fix_mailerRafael Mendonça França2015-02-186-20/+38
|\ \ \ \
| * | | | follow up to #18074yuuji.yaginuma2015-01-086-20/+38
* | | | | Merge pull request #18634 from morgoth/deprecate-some-errors-methodsRafael Mendonça França2015-02-183-24/+54
|\ \ \ \ \
| * | | | | Deprecate `ActiveModel::Errors` `get`, `set` and `[]=` methods.Wojciech Wnętrzak2015-02-013-24/+54
* | | | | | Add nodoc to private constant [ci skip]Rafael Mendonça França2015-02-181-1/+1
* | | | | | Merge pull request #18970 from nithinbekal/local-assigns-docRafael Mendonça França2015-02-181-0/+8
|\ \ \ \ \ \
| * | | | | | Add documentation for local_assigns [ci skip]Nithin Bekal2015-02-171-0/+8
* | | | | | | Improve documentation of local_assignsRafael Mendonça França2015-02-181-7/+13
* | | | | | | Merge pull request #15700 from maurogeorge/guides-local_assignsRafael Mendonça França2015-02-182-0/+37
|\ \ \ \ \ \ \
| * | | | | | | Add RDoc about local_assignsMauro George2014-06-131-0/+7
| * | | | | | | Add docs about local_assigns on guidesMauro George2014-06-131-0/+30
* | | | | | | | Talk about Gemfile.lock in the contributing guideRafael Mendonça França2015-02-181-3/+7
* | | | | | | | Merge pull request #18992 from rails/rm-track-lock-fileRafael Mendonça França2015-02-183-1/+282
|\ \ \ \ \ \ \ \
| * | | | | | | | Track Gemfile.lock at the repositoryRafael Mendonça França2015-02-183-1/+282
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | Revert "Merge pull request #18951 from jurezove/gemfile-lock-to-plugin-gitign...Rafael Mendonça França2015-02-181-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #18984 from rousisk/masterCarlos Antonio da Silva2015-02-182-5/+4
|\ \ \ \ \ \ \
| * | | | | | | Replace deprecated readonly option with scope blocks in docs and guideKonstantinos Rousis2015-02-182-5/+4
* | | | | | | | Merge pull request #18987 from kamipo/prefer_drop_table_if_exists_true_over_r...Carlos Antonio da Silva2015-02-1821-25/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Prefer `drop_table if_exists: true` over raw SQLRyuta Kamizono2015-02-1821-25/+25
|/ / / / / / / /
* / / / / / / / constants guide: adds a step to a resolution algorithmXavier Noria2015-02-181-1/+3
|/ / / / / / /
* | | | | | | prefer `drop_table if_exists: true` over raw SQL.Yves Senn2015-02-1812-12/+12
* | | | | | | Merge pull request #18980 from nicolasmlv/fix-typo-in-guideZachary Scott2015-02-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix type in guide - missing wordNicolas Maloeuvre2015-02-181-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18843 from yuki24/guides-add-guide-for-mail-previewZachary Scott2015-02-171-0/+33
|\ \ \ \ \ \ \
| * | | | | | | Add guide for Action Mailer PreviewsYuki Nishijima2015-02-081-0/+33
* | | | | | | | Add docs for the type registrySean Griffin2015-02-172-5/+24
* | | | | | | | Rm `Type#type_cast`Sean Griffin2015-02-1713-28/+20
* | | | | | | | `type_cast_from_user` -> `cast`Sean Griffin2015-02-1722-106/+106
* | | | | | | | `type_cast_for_database` -> `serialize`Sean Griffin2015-02-1740-79/+79
* | | | | | | | `Type#type_cast_from_database` -> `Type#deserialize`Sean Griffin2015-02-1736-71/+71
* | | | | | | | Add line endings to files which are missing themSean Griffin2015-02-1716-16/+16
* | | | | | | | Fix test failures on Mysql 5.5Sean Griffin2015-02-171-1/+1
* | | | | | | | Update code which depended on methods added by 1502caefSean Griffin2015-02-171-1/+1
* | | | | | | | Revert "Allow `:precision` option for time type columns"Sean Griffin2015-02-177-90/+19
* | | | | | | | Merge branch 'y-yagi-fix_deprecate_msg'eileencodes2015-02-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | correct method name in deprecation messageyuuji.yaginuma2015-02-181-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #18961 from vipulnsward/deprecate-start-valueYves Senn2015-02-174-33/+73
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Deprecated passing of `start` value to `find_in_batches` and `find_each` in f...Vipul A M2015-02-174-33/+73
* | | | | | | | Revert c732a66:Zachary Scott2015-02-161-0/+4
* | | | | | | | Revert "Don't unhook autoloading in production"Aaron Patterson2015-02-161-0/+7
|/ / / / / / /
* | | | | | | Merge pull request #18960 from ctaintor/remove_dependency_docZachary Scott2015-02-161-4/+0
|\ \ \ \ \ \ \
| * | | | | | | removes docs for dependency_loading config option and disable_dependency_load...Case Taintor2015-02-161-4/+0
* | | | | | | | Merge pull request #18959 from phillbaker/cleanup/server-log-pathCarlos Antonio da Silva2015-02-161-4/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |