aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8466 from gclag/stats-handle-new-test-locationsJeremy Kemper2012-12-081-1/+7
|\
| * Make code statistics rake task handle new test locations properlyGeorge Claghorn2012-12-091-1/+7
|/
* Omit directories from gemspec.files for RubyGems 2 compat.Jeremy Kemper2012-12-087-7/+7
* Fix method assertion ensuring it will match "end" with the same indentationCarlos Antonio da Silva2012-12-081-2/+2
* Merge pull request #8346 from sodabrew/patch-1Jeremy Kemper2012-12-088-34/+144
|\
| * Session variables for mysql, mysql2, and postgresql adapters can be setAaron Stone2012-12-088-34/+144
* | Merge pull request #8348 from danchoi/masterVijay Dev2012-12-084-5/+128
|\ \
| * | Add periodical-style TOC and navigation to Kindle version of guidesDaniel Choi2012-12-014-5/+128
* | | update release notes [ci skip]Vijay Dev2012-12-081-1/+41
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0832-172/+196
|\ \
| * | copy edits [ci skip]Vijay Dev2012-12-082-4/+3
| * | Revert "Introduce Bundler and Gemfiles in a NOTE"Vijay Dev2012-12-081-2/+0
| * | Fill out API Documentation Guidelines 'you will learn' list.Steve Klabnik2012-12-071-0/+4
| * | Fill out Active Support Core Extensions 'you will learn' list.Steve Klabnik2012-12-071-0/+5
| * | Remove reference to background queue in mailer guide.Steve Klabnik2012-12-071-2/+0
| * | Remove references to Rails versions.Steve Klabnik2012-12-0713-59/+15
| * | Update activesupport/lib/active_support/deprecation/proxy_wrappers.rbClaudio B.2012-12-071-1/+1
| * | Punctuation, capitalization, grammar fixes in rails guidesKatie Oldaker2012-12-077-15/+19
| * | Fix small grammatical errorMax Katz2012-12-071-1/+1
| * | Fixed grammar in a lot of guide prologues.Katie Oldaker2012-12-0722-88/+88
| * | Added overview items to Guides Guidelines prologueIan C. Anderson2012-12-071-0/+3
| * | changing tense, since Rails 3.2 has been releasedDrew Dara-Abrams2012-12-061-1/+1
| * | API reader should look elsewhere for helper instructionsThiago Pinto2012-12-061-0/+24
| * | complementary options guidelines for f.file_field and file_field_tagThiago Pinto2012-12-062-0/+8
| * | adding example for f.file_inputThiago Pinto2012-12-061-0/+3
| * | adding example for f.file_inputThiago Pinto2012-12-061-0/+3
| * | correct bad jquery syntaxThiago Pinto2012-12-061-2/+2
| * | Introduce Bundler and Gemfiles in a NOTEPablo Torres2012-12-051-0/+2
| * | Define a generator before referring to itPablo Torres2012-12-041-1/+1
| * | Correct bad EnglishPablo Torres2012-12-041-2/+2
| * | Merge pull request #120 from tonytonyjan/patch簡煒航2012-12-041-1/+18
| |\ \
| | * | add a notice about loading assets in production modeTony Jian2012-12-051-1/+18
| |/ /
* | | Fix scaffold controller generator testsCarlos Antonio da Silva2012-12-081-8/+6
* | | Improve where.not docs [ci skip]Carlos Antonio da Silva2012-12-081-14/+8
* | | Merge pull request #8461 from frodsan/fix_assert_method_generatorsCarlos Antonio da Silva2012-12-081-1/+1
|\ \ \
| * | | Fix #assert_instance_method to also assert indented methodsFrancesco Rodriguez2012-12-081-1/+1
* | | | Merge pull request #8465 from frodsan/update_am_action_callbacksRafael Mendonça França2012-12-085-19/+19
|\ \ \ \
| * | | | use _action callbacks in actionmailerFrancesco Rodriguez2012-12-085-19/+19
|/ / / /
* | | | Merge pull request #8395 from bmaland/attr_accessorsCarlos Antonio da Silva2012-12-081-23/+1
|\ \ \ \
| * | | | Use attr_accessor for Rails.{application,cache,logger}Bjørn Arild Mæland2012-12-011-23/+1
* | | | | Merge pull request #8457 from caike/masterCarlos Antonio da Silva2012-12-081-4/+4
|\ \ \ \ \
| * | | | | Update AR Changelog with correct example using includesCaike Souza2012-12-081-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #8462 from frodsan/update_guides_action_callbacksCarlos Antonio da Silva2012-12-086-21/+21
|\ \ \ \ \
| * | | | | update guides to use _action callbacks [ci skip]Francesco Rodriguez2012-12-076-21/+21
| |/ / / /
* | | | | Merge pull request #8459 from frodsan/explicit!Carlos Antonio da Silva2012-12-082-19/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix scaffold controller generator testsFrancesco Rodriguez2012-12-071-16/+12
| * | | | use :only instead of :except callback option in the controller templateFrancesco Rodriguez2012-12-071-3/+2
|/ / / /
* | | | Merge pull request #8456 from frodsan/actionize2Xavier Noria2012-12-075-32/+76
|\ \ \ \
| * | | | add tests to aliased _filter callbacksFrancesco Rodriguez2012-12-071-0/+46
| * | | | use `_action` instead of `_filter` callbacksFrancesco Rodriguez2012-12-075-34/+32
|/ / / /