aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Remove rb-fsevent from Gemfile.José Valim2011-12-081-3/+0
|/ / /
* | | updates the host and port of publish_docs, and changes the release instructio...Xavier Noria2011-12-082-2/+2
* | | use our own fork of sdoc while Vijay's fix is not applied to voloko/sdocXavier Noria2011-12-081-1/+5
* | | releasing instructions: updates the URLs that triggers stable docs generation...Xavier Noria2011-12-081-1/+1
* | | Merge pull request #3900 from jfturcot/accessible_wrap_paramsJosé Valim2011-12-083-2/+41
|\ \ \
| * | | Add information to the changelog about the changes to ActionController::Param...Jean-Francois Turcot2011-12-081-0/+5
| * | | ParamsWrapper only wrap the accessible attributes when they were setJean-Francois Turcot2011-12-072-2/+36
* | | | Fix broken test_exists_query_logging from the table_exists? changeJon Leighton2011-12-081-0/+1
* | | | Remove dead broken code from AD::RequestJosé Valim2011-12-081-8/+0
* | | | Merge pull request #3888 from kennyj/should_use_default_charsetJosé Valim2011-12-082-0/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Assign config.encoding to AD::Response.default_charset at the initialization ...kennyj2011-12-072-0/+7
* | | | Merge pull request #3901 from mark-rushakoff/inflection-regex-fixJosé Valim2011-12-082-4/+8
|\ \ \ \
| * | | | Fix inflection regexes for mouse, miceMark Rushakoff2011-12-072-4/+8
|/ / / /
* | | | moving ignored regexp to the instanceAaron Patterson2011-12-071-6/+8
* | | | speeding up ignored sql testingAaron Patterson2011-12-071-1/+4
* | | | Use a hash to look up column definitionsAaron Patterson2011-12-071-2/+3
* | | | try to normalize the objects passed to column()Aaron Patterson2011-12-071-9/+11
* | | | automatically add the column definition to the columns list if creating a new...Aaron Patterson2011-12-071-12/+21
* | | | stop calling String#to_s so frequentlyAaron Patterson2011-12-071-3/+4
* | | | the required sqlite3 adapter responds to encoding, so stop checking.Aaron Patterson2011-12-071-5/+1
| |/ / |/| |
* | | Remove #:nodoc: from partial renderer.José Valim2011-12-071-1/+1
* | | Merge pull request #3895 from kennyj/should_use_freezed_constantJosé Valim2011-12-073-24/+40
|\ \ \
| * | | Use freezed string constant. Some string literals is used repeatedly.kennyj2011-12-083-24/+40
* | | | Merge pull request #3889 from kielkowicz/masterJosé Valim2011-12-074-69/+135
|\ \ \ \ | |/ / / |/| | |
| * | | Moves migrations tests from railties/test/application/rake_test.rb to railtie...Kazimierz Kiełkowicz2011-12-072-68/+85
| * | | Move rake notes test to railties/test/application/rake/notes_test.rbKazimierz Kiełkowicz2011-12-072-42/+45
| * | | Update source_annotation_extractor comment.Kazimierz Kiełkowicz2011-12-071-1/+1
| * | | Add annotation to haml and slim template.Kazimierz Kiełkowicz2011-12-072-0/+46
* | | | Merge pull request #3884 from sikachu/master-fix_layoutJosé Valim2011-12-076-40/+125
|\ \ \ \
| * | | | Allow layout fallback when using `layout` methodPrem Sichanugrist2011-12-063-26/+93
| * | | | Fix bug in assert_template when using only `:layout` optionPrem Sichanugrist2011-12-063-14/+32
| |/ / /
* | | | Merge pull request #3894 from kelyar/masterSantiago Pastorino2011-12-071-1/+1
|\ \ \ \
| * | | | reversible migration example had missing block parameterEvgeniy Kelyarsky2011-12-071-1/+1
|/ / / /
* | | | Merge pull request #3878 from kennyj/should_use_default_charsetJosé Valim2011-12-072-1/+12
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Use default charset when we read content type without charset.kennyj2011-12-072-1/+12
* | | Just track "require" if we have something in the watching stack.José Valim2011-12-061-1/+5
* | | avoid deprecated methodsAaron Patterson2011-12-061-1/+1
* | | add prefix and suffix to renamed tables, closes #1510Vasiliy Ermolovich2011-12-064-0/+52
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-066-17/+21
|\ \ | |/ |/|
| * Revert "Added link to ActiveResource::Base documentation"Vijay Dev2011-12-061-1/+1
| * use textile syntax in linksVijay Dev2011-12-061-1/+1
| * rxml and rhtml are no longer searched for source code annotationsVijay Dev2011-12-061-1/+1
| * copy edits in layouts guide, change links to be relativeVijay Dev2011-12-061-6/+6
| * Added link to ActiveResource::Base documentationsandeepravi2011-12-061-1/+1
| * Added link to ActiveResource::Base documentationsandeepravi2011-12-061-1/+1
| * Added git --rebase option for pulling rails masterThomas von Deyen2011-12-061-1/+1
| * Added wiki link to RESTsandeepravi2011-12-061-1/+1
| * Added wiki link for RESTsandeepravi2011-12-061-1/+1
| * Use do end for multiline block.Uģis Ozols2011-12-051-2/+2
| * .rhtml and .rxml was removed in Rails 3.Uģis Ozols2011-12-051-2/+2