aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor copy editingNeeraj Singh2013-03-111-4/+4
* I think "uniq" is more Rails-y than select("distinct(categories.id)")capps2013-03-111-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-109-16/+92
|\
| * copy edits [ci skip]Vijay Dev2013-03-102-4/+4
| * fixed typo in strong parameters exampleYves Senn2013-03-091-1/+1
| * strong parameter example for hashes with integer keys.Yves Senn2013-03-091-0/+14
| * Adding a note for :body option in `mail` method.Fabrizio Regini2013-03-081-0/+13
| * fixing typo in the merging scopes sectionNeeraj Singh2013-03-081-4/+3
| * Explained how merging of scope worksNeeraj Singh2013-03-081-0/+56
| * Some copy edit and formatting for upgrading guide.Hendy Tanata2013-03-081-3/+3
| * remove the new metadata note in Rails 4 upgrade guideAlex Robbin2013-03-071-6/+0
| * fixes active_record_querying #pluck exampleawilliams2013-03-071-1/+1
| * Update capture_helper.rbJess Brown2013-03-061-1/+1
| * TypppoAkira Matsuda2013-03-063-4/+4
* | Fix AMo code example indent, add missing author to entry [ci skip]Carlos Antonio da Silva2013-03-091-6/+8
* | Bump up timeoutsJon Leighton2013-03-091-3/+3
* | Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_offSteve Klabnik2013-03-091-4/+4
|\ \
| * | Renumbering the comments in the application boot process.wangjohn2013-03-091-4/+4
|/ /
* | Merge pull request #9627 from rubys/masterCarlos Antonio da Silva2013-03-091-0/+1
|\ \
| * | ensure response.stream is closedSam Ruby2013-03-091-0/+1
|/ /
* | Merge pull request #9621 from sakuro/migration-magic-comment-fixJeremy Kemper2013-03-094-3/+48
|\ \
| * | Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-094-3/+48
* | | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-1/+24
|\ \ \
| * | | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-083-1/+24
* | | | Merge pull request #9623 from Agis-/patch-2Carlos Antonio da Silva2013-03-091-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove extra whitespace and fix a commentAgis Anastasopoulos2013-03-091-2/+2
|/ / /
* | | Fix failing test regarding console change to fix sandboxingCarlos Antonio da Silva2013-03-081-11/+10
* | | Merge pull request #8670 from sanemat/fix/rake-descVijay Dev2013-03-081-0/+2
|\ \ \
| * | | Add rake test descriptionsanemat2013-01-011-0/+2
* | | | Merge pull request #9614 from wangjohn/refactoring_nested_associations_for_re...Rafael Mendonça França2013-03-081-26/+54
|\ \ \ \
| * | | | Refactored nested associations so they are more readable. Added commentswangjohn2013-03-081-26/+54
|/ / / /
* | | | Fix changelog indent, remove self from method call in changelog/doc examplesCarlos Antonio da Silva2013-03-082-4/+6
* | | | The console --sandbox transaction should not be joinableJon Leighton2013-03-082-11/+10
* | | | Make sure options is a hashRafael Mendonça França2013-03-081-1/+3
* | | | Avoid short-circuit returnRafael Mendonça França2013-03-081-5/+9
* | | | Merge pull request #9497 from route/subclass_from_attrsRafael Mendonça França2013-03-084-2/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix ActiveRecord `subclass_from_attrs` when eager_load is false.Dmitry Vorotilin2013-03-064-2/+22
* | | | Merge pull request #9611 from choudhuryanupam/masterRafael Mendonça França2013-03-081-40/+40
|\ \ \ \
| * | | | Refactored test case with standard variable namingAnupam Choudhury2013-03-081-40/+40
|/ / / /
* | | | Fix rails console --sandboxJon Leighton2013-03-083-11/+79
* | | | Merge pull request #8868 from tehgeekmeister/masterRafael Mendonça França2013-03-083-0/+33
|\ \ \ \
| * | | | If an index can't be found by column, use the index name.Ezekiel Smithburg2013-03-073-0/+32
* | | | | Merge pull request #8966 from cfabianski/disable_prepared_statement_when_prep...Rafael Mendonça França2013-03-086-3/+33
|\ \ \ \ \
| * | | | | Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-086-3/+33
| |/ / / /
* | | | | Merge pull request #9609 from arunagw/using-latest-arjdbcCarlos Antonio da Silva2013-03-081-3/+3
* | | | | Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-082-3/+2
* | | | | Write a more comprehensive CHANGELOG message [ci skip]Jon Leighton2013-03-081-3/+45
* | | | | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-083-6/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-073-6/+22
* | | | | Fix warningsCarlos Antonio da Silva2013-03-071-2/+2