aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19120 from yui-knk/fix/md_tableAbdelkader Boudih2015-02-281-9/+9
|\
| * [ci skip] Fix table of 4_1_release_notes.mdyui-knk2015-02-281-9/+9
|/
* Merge pull request #19114 from richardvenneman/i18n-guide-updateKasper Timm Hansen2015-02-271-5/+2
|\
| * Remove reference to workingwithrails.com since it is being retiredRichard Venneman2015-02-271-5/+2
|/
* Add changelog for #15549 fix [skip ci]Arthur Neves2015-02-271-0/+7
* Merge pull request #19113 from vipulnsward/remove-requiresRafael Mendonça França2015-02-274-5/+0
|\
| * Removed non-standard and unused require 'active_support/deprecation' from par...Vipul A M2015-02-274-5/+0
* | Don't recommend to precompile all assetsRafael Mendonça França2015-02-271-21/+0
|/
* Merge pull request #19111 from icem/patch-1Xavier Noria2015-02-271-1/+1
|\
| * Guides mistake about page caching.Yury Otcheski2015-02-271-1/+1
|/
* Merge pull request #19102 from ulissesalmeida/fix-regression-default-translationRafael Mendonça França2015-02-273-1/+15
|\
| * Fix regression when passing a value different of String.Ulisses Almeida2015-02-263-1/+15
* | Merge pull request #19110 from aditya-kapoor/fix-val-docRafael Mendonça França2015-02-271-2/+2
|\ \
| * | [ci-skip] correct doc about custom validatorsAditya Kapoor2015-02-271-2/+2
|/ /
* | Merge pull request #19104 from y-yagi/fix_skip_filterCarlos Antonio da Silva2015-02-272-1/+9
|\ \
| * | fix NameError in `skip_filter`. callback doesn't exist.yuuji.yaginuma2015-02-272-1/+9
| |/
* | Merge pull request #19107 from prathamesh-sonpatki/template-inheritanceAbdelkader Boudih2015-02-271-1/+1
|\ \
| * | Fix wording in template inheritance section of layout guide [ci skip]Prathamesh Sonpatki2015-02-271-1/+1
* | | Revert integration test refactoring that caused app test regressionsJeremy Kemper2015-02-262-10/+18
* | | Revert "Merge pull request #18764 from tsun1215/master"Jeremy Kemper2015-02-262-5/+5
| |/ |/|
* | Properly create through records when called with `where`Sean Griffin2015-02-263-0/+26
* | Merge pull request #18434 from brainopia/change_filter_on_rails_info_routesRichard Schneeman2015-02-267-99/+123
|\ \
| * | Change filter on /rails/info/routes to use an actual path regexp from railsbrainopia2015-02-237-99/+123
* | | Merge pull request #19095 from waseem/rails_runner_ruby_fileRafael Mendonça França2015-02-261-0/+6
|\ \ \
| * | | Section explaining how rails runner accepts code in a ruby file.Waseem Ahmad2015-02-261-0/+6
* | | | [ci skip] Add changelog entry for #18948.Kasper Timm Hansen2015-02-261-0/+20
|/ / /
* | | :nailcare:Akira Matsuda2015-02-261-1/+1
* | | Merge pull request #19088 from teeceepee/patch-1Yves Senn2015-02-261-1/+2
|\ \ \ | |_|/ |/| |
| * | Fix typos in ActionView::Helpers::FormBuilder comment [ci skip]Yu Haidong2015-02-261-1/+2
|/ /
* | Merge pull request #16738 from net-engine/guides-template-inheritanceRafael Mendonça França2015-02-251-0/+36
|\ \
| * \ Merge remote-tracking branch 'origin/master' into guides-template-inheritanceecoologic2014-10-07235-943/+3435
| |\ \
| * | | 2.2.14.5 Template Inheritance (new in guide, feature in since 3.1)erik2014-08-291-0/+36
* | | | Merge pull request #17601 from kamipo/support_any_unicode_charsetsRafael Mendonça França2015-02-254-11/+16
|\ \ \ \
| * | | | Add `SchemaMigration.create_table` support any unicode charsets for MySQL.Ryuta Kamizono2015-02-264-11/+16
* | | | | Merge pull request #17297 from rebyn/fix/17161-remove-objs-from-has_many-upda...Rafael Mendonça França2015-02-252-0/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add specs for adding-to/clear has_many collections’s behavior on `updated_at`Tu Hoang2014-10-302-0/+26
* | | | | Merge pull request #15476 from JacobEvelyn/masterRafael Mendonça França2015-02-252-0/+10
|\ \ \ \ \
| * | | | | Use logger environment settings in Rails console.Jacob Evelyn2014-06-022-0/+10
* | | | | | fix bug in Levenshtein distance calculationschneems2015-02-251-2/+0
* | | | | | add CHANGELOG for f6e293ec54f02f83cdb37502bea117f66f87bcae. [ci skip]Yves Senn2015-02-251-0/+7
* | | | | | Fix default headers in test responsesJeremy Kemper2015-02-255-34/+69
* | | | | | Merge pull request #19076 from nygrenh/truncate-words-fixRafael Mendonça França2015-02-253-1/+15
|\ \ \ \ \ \
| * | | | | | Fix a backtracking problem in String#truncate_wordsHenrik Nygren2015-02-253-1/+15
* | | | | | | Merge pull request #19074 from Mession/fix_test_dependency_of_erb_template_pa...Rafael Mendonça França2015-02-253-5/+20
|\ \ \ \ \ \ \
| * | | | | | | Fix dependency tracker bugJuho Leinonen2015-02-253-5/+20
| |/ / / / / /
* | | | | | | Merge pull request #18948 from kaspth/automatic-collection-cachingRafael Mendonça França2015-02-2517-22/+305
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Instrument read_multi.Kasper Timm Hansen2015-02-213-20/+46
| * | | | | | Collections automatically cache and fetch partials.Kasper Timm Hansen2015-02-2111-3/+167
| * | | | | | Merge multi_fetch_fragments.Kasper Timm Hansen2015-02-206-2/+95
* | | | | | | Merge pull request #19072 from y-yagi/mailer_docAbdelkader Boudih2015-02-251-15/+15
|\ \ \ \ \ \ \