aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-0891-18457/+1213
|\
| * update readme to reflect app/assetsVijay Dev2011-05-071-5/+10
| * Updated change log for jdbc* adapters template.Arun Agrawal2011-05-071-0/+12
| * ADdd missing requires (thanks to @arunagw)José Valim2011-05-072-1/+2
| * Merge pull request #263 from CvX/masterJosé Valim2011-05-071-1/+1
| |\
| | * Corrected dbconsole usage message.2011-04-121-1/+1
| * | adds comments clarifying the role of SharedGeneratorTestsXavier Noria2011-05-073-0/+7
| * | Add test to verify production rake tasks flush logger on exitJason Rudolph2011-05-061-0/+13
| * | Always flush logger at exitJason Rudolph2011-05-062-14/+9
| * | be consistentAditya Sanghi2011-05-061-3/+1
| * | review fixesAditya Sanghi2011-05-063-6/+11
| * | default orm and test_framework to false; change application.rb template accor...Aditya Sanghi2011-05-063-12/+12
| * | When skipping skip active record, mark config.generators.orm to false; LH 579...Aditya Sanghi2011-05-062-1/+6
| * | Take into account the Rack::Server :SSLEnable option when building the applic...Daniel Martin2011-05-061-1/+2
| * | Ensure params wrapper settings are not inherited and calculated each time.José Valim2011-05-061-3/+27
| * | Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assetsJosé Valim2011-05-052-1/+10
| |\ \
| | * | Display custom asset routes in `rake routes`Peter Suschlik2011-05-052-1/+10
| * | | add tests for performance testJan Xie2011-05-051-0/+25
| |/ /
| * | Merge pull request #390 from arunagw/jruby_opensslJosé Valim2011-05-052-0/+2
| |\ \
| | * | Adding jruby-openssl in Gemfile by default. #jrubyArun Agrawal2011-05-052-0/+2
| * | | Merge pull request #391 from bradleypriest/patch-1José Valim2011-05-051-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Tidying up the language in wrap_parameters.rbBradley Priest2011-05-041-1/+1
| * | | No longer need to reference mysql2 from gitDavid Heinemeier Hansson2011-05-041-9/+1
| |/ /
| * | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
| * | Dont show the assets mount in rake routesDavid Heinemeier Hansson2011-05-041-1/+2
| * | Bump up rack-cache, tzinfo and thorSantiago Pastorino2011-05-041-1/+1
| * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-042-35/+35
| |\ \
| | * | commented meta codeVijay Dev2011-05-041-11/+11
| | * | formatting results in commentsVijay Dev2011-05-042-24/+24
| * | | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs like...José Valim2011-05-044-12/+19
| * | | Remove defined?(ActiveRecord) and use the railtie hook instead.José Valim2011-05-041-4/+0
| |/ /
| * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-044-54/+19
| |\ \
| | * | Fix typo in Factory Girl descriptionbackspace2011-05-031-1/+1
| | * | removed reference to verify methodVijay Dev2011-05-021-9/+1
| | * | removed verify docs (feature removed in Rails3)Vijay Dev2011-05-021-39/+0
| | * | Update security guide with #new and #create respect mass-assignmentSebastian Martinez2011-05-021-2/+14
| | * | Bring this back on the contributing guide.Sebastian Martinez2011-05-011-1/+1
| | * | remove info about adding verified tagVijay Dev2011-05-011-1/+1
| | * | fix GitHub guides urlVijay Dev2011-05-011-2/+2
| * | | fixes typo in railties/CHANGELOG (spotted by Vijay Dev)Xavier Noria2011-05-041-1/+1
| * | | Fixed tests for new_plugin_generator.Arun Agrawal2011-05-041-2/+0
| * | | restores the -j option, but now it accepts the name of any libraryXavier Noria2011-05-049-33/+45
| * | | removes the :update_ujs task in railtiesXavier Noria2011-05-041-4/+0
| * | | jQuery is no longer vendoredXavier Noria2011-05-043-8465/+2
| * | | Add static_cache_control as configuration option and set a default for test. ...José Valim2011-05-033-3/+8
| * | | We no longer depend on those git repos.José Valim2011-05-031-6/+0
| * | | Use require_self from latest SprocketsDavid Heinemeier Hansson2011-05-021-0/+1
| * | | Allow ignore_accept_header through configuration option.José Valim2011-05-021-0/+21
| * | | Merge pull request #359 from sikachu/params_wrapper.David Heinemeier Hansson2011-05-022-0/+22
| |\ \ \
| | * | | Add `ActionController::ParamsWrapper` to wrap parameters into a nested hashPrem Sichanugrist2011-05-032-0/+22
| | |/ /