aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove fixture files with Windows incompatible filenamesAndrew White2012-02-2013-38/+88
* Integration tests support the OPTIONS http methodJeremy Kemper2012-02-193-2/+26
* Merge pull request #5085 from simi/patch-1Vijay Dev2012-02-181-1/+1
|\
| * Update activerecord/CHANGELOG.mdJosef Šimánek2012-02-181-1/+1
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-1812-62/+281
|\
| * fix some typos [ci skip]Vijay Dev2012-02-181-3/+3
| * Documenting the :inverse_of option for associationsMike Gunderloy2012-02-181-0/+99
| * Fix actionpack readme weblog exampleAlexey Vakhov2012-02-181-1/+1
| * Fix AbstractController::Base#hidden_actions commentAlexey Vakhov2012-02-181-2/+2
| * Do get it right this time. Fixing the documentation around :dependent => :res...Aditya Sanghi2012-02-181-5/+5
| * Add note about Rails 4.0 changesAditya Sanghi2012-02-181-0/+4
| * Add a note about :dependent => :restrict on has_one and has_many's optionsAditya Sanghi2012-02-181-0/+2
| * Update Time#change docs to reflect the options it usesEric Oestrich2012-02-171-1/+1
| * [engines guide] basic revision/review workRyan Bigg2012-02-161-31/+89
| * [engines guide] Clean up explanation for routing methodsRyan Bigg2012-02-161-5/+17
| * [engines guide] Elaborate on isolate_namespace functionalityRyan Bigg2012-02-161-1/+7
| * update engines guide to explicitly reference relative-to-engine-root-path for...Ryan Bigg2012-02-161-1/+1
| * [engines guide] Revise draft of guide, add testing, assets and dependencies s...Ryan Bigg2012-02-161-25/+63
| * Rails::Engine docs should use helper method, not helpersRyan Bigg2012-02-161-1/+1
| * Fix AM block_format helper method descriptionAlexey Vakhov2012-02-151-2/+1
| * Update f.button docs to reflect real label implementationCarlos Antonio da Silva2012-02-141-5/+5
| * fix spacer template exampleSergey Nartimov2012-02-121-1/+1
| * Cosmetic fix in AM readmeAlexey Vakhov2012-02-121-1/+1
| * Change AR validation guide to remove ordered hash mention related to AMo::ErrorsCarlos Antonio da Silva2012-02-091-1/+1
| * Fixed styles when browser is narrower than 69em.Jeff Dickey2012-02-091-0/+1
* | Merge pull request #3479 from arvida/ensure-date-header-on-expires-inJosé Valim2012-02-183-0/+24
|\ \
| * | Ensuring a HTTP Date header when setting Cache-Control's max-age with #expire...arvida2011-10-311-0/+3
| * | Added accessor methods for Date headerarvida2011-10-311-0/+14
| * | Added test for setting of HTTP Date header when calling #expires_inarvida2011-10-311-0/+7
* | | Merge pull request #5076 from petmit/migrate_status_without_timestampsAaron Patterson2012-02-172-3/+52
|\ \ \
| * | | Correctly print names of non-timestamped migrations with db:migrate:statusPeter Mitchell2012-02-172-3/+52
|/ / /
* | | Simplify regexpAndrew White2012-02-171-1/+1
* | | Fix ActionDispatch::Static to serve files with unencoded PCHARAndrew White2012-02-1714-4/+48
* | | let expires_in accept a must_revalidate flagXavier Noria2012-02-173-2/+29
* | | Merge pull request #5066 from lest/patch-1José Valim2012-02-173-1/+6
|\ \ \
| * | | escape static file path to prevent double unescapingSergey Nartimov2012-02-163-1/+6
* | | | use Process.pid rather than $$Aaron Patterson2012-02-163-7/+7
* | | | database connections are automatically established after forking.Aaron Patterson2012-02-163-14/+73
* | | | Fix tests, Rails.env may be different on CIPiotr Sarnacki2012-02-161-2/+5
* | | | Refactor Rails::Console to make it easier to test and add tests for itPiotr Sarnacki2012-02-162-25/+130
* | | | Allow to set custom console type with Rails.application.config.console=Piotr Sarnacki2012-02-164-3/+27
* | | | Remove console --irb deprecation noticePiotr Sarnacki2012-02-161-1/+0
|/ / /
* | | Merge pull request #5064 from lest/patch-1Jeremy Kemper2012-02-163-6/+19
|\ \ \
| * | | move id_before_type_cast to PrimaryKey moduleSergey Nartimov2012-02-163-6/+19
* | | | Merge pull request #5059 from waseem/autoload_effectivelyXavier Noria2012-02-161-9/+12
|\ \ \ \
| * | | | Autoload various constants effectively in abstract connection adapter.Waseem Ahmad2012-02-161-9/+12
| |/ / /
* | | | Merge pull request #5062 from bogdan/test2José Valim2012-02-161-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | ActionDispatch: add missing test for callbacksBogdan Gusiev2012-02-161-2/+9
|/ / /
* | | Merge pull request #5055 from rafaelfranca/fix-drop-tableJeremy Kemper2012-02-151-2/+2
|\ \ \
| * | | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-151-2/+2
|/ / /