aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #8152 from steveklabnik/squashing_guideXavier Noria2012-11-091-0/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Add note about squashing in contributor guide.Steve Klabnik + Katrina Owen2012-11-091-0/+38
|/ / /
* | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
* | | make the extremely useful logs debug levelAaron Patterson2012-11-091-2/+2
* | | copy the log level from the config settingsAaron Patterson2012-11-091-0/+1
* | | Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-083-11/+29
|\ \ \
| * | | Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-013-11/+29
* | | | rm dead codeAaron Patterson2012-11-091-1/+1
* | | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-087-69/+83
|\ \ \ \
| * | | | Clean up gemspecsVinny Diehl2012-11-087-69/+83
* | | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10
* | | | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
* | | | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-083-10/+46
|\ \ \ \ \
| * | | | | Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-033-10/+46
* | | | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-082-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| * | | | | test case to lock down the behavior of #7842Yves Senn2012-11-041-0/+5
* | | | | | Merge pull request #8145 from sobrinho/masterRafael Mendonça França2012-11-081-0/+11
|\ \ \ \ \ \
| * | | | | | Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8Gabriel Sobrinho & Ricardo Henrique2012-11-081-0/+11
* | | | | | | Add CHANGELOG entry for #8108 on master too.Rafael Mendonça França2012-11-081-0/+16
|/ / / / / /
* | | | | | Merge pull request #8139 from senny/8121_engine_generator_rakefile_without_te...Carlos Antonio da Silva2012-11-084-3/+18
|\ \ \ \ \ \
| * | | | | | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-084-3/+18
|/ / / / / /
* | | | | | Remove not used indifferent_access requires from Base and FinderMethodsCarlos Antonio da Silva2012-11-072-3/+0
* | | | | | Use cached quoted_table_name instead of going through the connectionCarlos Antonio da Silva2012-11-071-1/+1
* | | | | | Remove block given check from private find_with_idsCarlos Antonio da Silva2012-11-071-2/+0
| |_|_|/ / |/| | | |
* | | | | Fix guides home links and maintain compatibility with small screensCarlos Antonio da Silva2012-11-071-1/+7
* | | | | Do not strip code blocks, otherwise we may get misaligned outputCarlos Antonio da Silva2012-11-071-1/+1
* | | | | stop raising so many exceptionsAaron Patterson2012-11-071-1/+5
* | | | | adding requires for constant dependenciesAaron Patterson2012-11-072-0/+6
* | | | | cleaning up constantize testsAaron Patterson2012-11-071-44/+44
* | | | | fix warnings in Ruby 2.0Aaron Patterson2012-11-072-0/+4
* | | | | Merge pull request #8132 from bquorning/permitted_is_sticky_on_sliceCarlos Antonio da Silva2012-11-062-7/+34
|\ \ \ \ \
| * | | | | Set @permitted on new instance when slicing parameters hashBenjamin Quorning2012-11-061-1/+3
| * | | | | Test that permitted? is sticky on accessors, mutators, and mergesBenjamin Quorning2012-11-061-0/+24
| * | | | | Test that not permitted is sticky on #exceptBenjamin Quorning2012-11-061-0/+1
| * | | | | Current tests are testing stickiness of non-permitted parametersBenjamin Quorning2012-11-061-3/+3
| * | | | | Fix buggy testsBenjamin Quorning2012-11-061-4/+4
|/ / / / /
* | | | | Update mocha github repo to new oneCarlos Antonio da Silva2012-11-061-1/+1
* | | | | mocha_standalone is now deprecated. Switch to mocha/api.Jeremy Kemper2012-11-052-2/+2
* | | | | Make the tests pass with minitest 4.2Rafael Mendonça França2012-11-051-0/+3
* | | | | Merge pull request #8118 from nashby/activemodel-errorsRafael Mendonça França2012-11-053-23/+41
|\ \ \ \ \
| * | | | | use Array() instead flattenVasiliy Ermolovich2012-11-053-23/+41
* | | | | | Remove AS::Concern extension from Testing::TaggedLoggingCarlos Antonio da Silva2012-11-051-4/+0
|/ / / / /
* | | | | Minor css style improvementsCarlos Antonio da Silva2012-11-041-47/+45
* | | | | Restore index link states to the way they are in current guideCarlos Antonio da Silva2012-11-041-2/+2
* | | | | Use flat_map when building AR orderCarlos Antonio da Silva2012-11-041-6/+4
* | | | | Add ensure block to make sure the state is properly restoredCarlos Antonio da Silva2012-11-042-2/+2
* | | | | Remove some line breaks between array items that make the assert file tests h...Carlos Antonio da Silva2012-11-044-42/+19
* | | | | Refactor Inflector#ordinal to avoid converting the number twiceCarlos Antonio da Silva2012-11-041-2/+4
* | | | | Fix typo in test nameCarlos Antonio da Silva2012-11-042-3/+2
|/ / / /