aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5269 from castlerock/remove_unwanted_require_karnel_repor...Piotr Sarnacki2012-03-041-1/+0
|\
| * AS/kernel/reporting no where used in ts_isolatedVishnu Atrai2012-03-041-1/+0
* | Merge pull request #5266 from bcardarella/root_with_string_optionsPiotr Sarnacki2012-03-042-0/+14
|\ \
| * | Route root helper shortcutBrian Cardarella2012-03-032-0/+14
* | | Merge pull request #5270 from kennyj/fix_3163Piotr Sarnacki2012-03-043-1/+22
|\ \ \ | |_|/ |/| |
| * | Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-03-053-1/+22
|/ /
* | Fix rake test_sqlite3_memJon Leighton2012-03-041-7/+9
* | Remove unusused variablesJon Leighton2012-03-043-14/+9
|/
* [engines guide] Add more concrete example of conflicts when not using isolate...Piotr Sarnacki2012-03-031-1/+1
* Handle files from ActionDispatch::Static with Rack::Sendfile (fixes #5225)Piotr Sarnacki2012-03-033-5/+18
* Merge pull request #5255 from carlosantoniodasilva/active-record-reviewPiotr Sarnacki2012-03-038-68/+77
|\
| * Refactor and cleanup in some ActiveRecord modulesCarlos Antonio da Silva2012-03-038-68/+77
* | Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\ \
| * | simplify namespace assignment in fields_forSergey Nartimov2012-03-021-1/+1
* | | Merge pull request #5260 from castlerock/remove_ordered_hash_usagesSantiago Pastorino2012-03-035-6/+6
|\ \ \
| * | | remove usages of AS::OrderedHashVishnu Atrai2012-03-035-6/+6
|/ / /
* | | Merge pull request #4984 from raghunadhd/change_orderhashVijay Dev2012-03-033-3/+3
|\ \ \
| * | | Refactored codeRaghunadh2012-02-103-3/+3
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-036-19/+65
|\ \ \ \
| * | | | copy edits [ci skip]Vijay Dev2012-03-031-1/+1
| * | | | Made documentation of config.assets.precompile slightly more explicit.Guy Bolton King2012-03-021-1/+3
| * | | | Removed max-stale from the setting the cache-headers in the response as max-s...Anuj Dutta2012-03-021-1/+1
| * | | | Add documentation for IndexDefinition.Waseem Ahmad2012-03-021-0/+3
| * | | | Improve header hierarchy.Joost Baaij2012-02-291-1/+3
| * | | | Include a comment as to why ETag header should be removed from the response.Joost Baaij2012-02-291-0/+1
| * | | | Changed asset_host config to more specificRahul P. Chaudhari2012-02-291-2/+2
| * | | | Some cleanup on the upgrading guideMike Gunderloy2012-02-281-14/+40
| * | | | Merge pull request #85 from whilefalse/rails_32_engine_upgradeVijay Dev2012-02-281-0/+12
| |\ \ \ \
| | * | | | Added guide to updating engines built in previous versions of RailsSteven Anderson2012-02-241-0/+12
* | | | | | Merge pull request #5258 from guilleiguaran/amo-modelJon Leighton2012-03-031-1/+1
|\ \ \ \ \ \
| * | | | | | Use public_send instead of send in ActiveModel::Model initializeGuillermo Iguaran2012-03-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #5256 from carlosantoniodasilva/active-model-modelJosé Valim2012-03-033-1/+81
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add docs with usage examples for ActiveModel::ModelCarlos Antonio da Silva2012-03-033-1/+81
|/ / / / /
* | | | | Merge pull request #5253 from guilleiguaran/amo-modelJeremy Kemper2012-03-024-0/+44
|\ \ \ \ \
| * | | | | Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatlyGuillermo Iguaran2012-03-024-0/+44
|/ / / / /
* | | | / Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that...Santiago Pastorino2012-03-031-1/+1
| |_|_|/ |/| | |
* | | | only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
* | | | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
* | | | Merge pull request #5243 from lest/patch-2José Valim2012-03-021-2/+2
|\ \ \ \
| * | | | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
|/ / / /
* | | | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-029-48/+107
|\ \ \ \
| * | | | Optimize url helpers.Sergey Nartimov + José Valim2012-03-026-29/+36
| * | | | Optimize path helpers.José Valim2012-03-025-29/+81
* | | | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
* | | | | Merge pull request #5241 from carlosantoniodasilva/output-safetyJosé Valim2012-03-021-3/+1
|\ \ \ \ \
| * | | | | Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-3/+1
|/ / / / /
* | | | | Merge pull request #5234 from benpickles/allow-empty-fieldsetsPiotr Sarnacki2012-03-022-2/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow fieldsets to be created without a block.Ben Pickles2012-03-012-2/+11
* | | | | revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
|/ / / /
* | | | Merge pull request #5232 from claudiob/add_release_date_to_docsVijay Dev2012-03-016-12/+12
|\ \ \ \