aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* layout affects views not methodsRajinder Yadav2012-02-261-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-255-5/+24
|\ | | | | | | | | Conflicts: actionmailer/CHANGELOG.md
| * copy-edits [ci skip]Vijay Dev2012-02-251-10/+8
| |
| * Fixed typo in composed_of example with Money#<=>, was comparing amount ↵Noah Hendrix2012-02-241-1/+1
| | | | | | | | itself instead of other_money.amount
| * Fix typo in match :to docsJustin Woodbridge2012-02-231-1/+1
| |
| * Cosmetic fixes in AM changelogAlexey Vakhov2012-02-231-1/+1
| |
| * Revert "Remove meaningless code from the examples" of AutosaveAssociation Dimitar Dimitrov2012-02-221-0/+3
| | | | | | Reverts a part of 91148936f770dc8bbbb33d46a09528f1a32d8a71. Should probably be squashed with it when merging back in rails/rails.
| * Minor fixes to ActiveRecord::AutosaveAssociation's docs Dimitar Dimitrov2012-02-221-5/+3
| | | | | | | | * Fix typos * Remove meaningless code from the examples
| * Merge pull request #84 from pawel2105/masterpawel21052012-02-211-0/+20
| |\ | | | | | | Database pooling configuration
| | * Added database pooling sub-section to the 'configuring' guideCynical Grinch2012-02-211-0/+20
| |/
| * Fix AbstractController#controller_path docAlexey Vakhov2012-02-191-1/+1
| |
* | Merge pull request #5117 from nashby/form-option-refactorJosé Valim2012-02-251-17/+11
|\ \ | | | | | | FormOptionsHelper refactor
| * | refactor option_text_and_value and option_value_selected? methodsVasiliy Ermolovich2012-02-211-10/+3
| | |
| * | refactor time_zone_options_for_selectVasiliy Ermolovich2012-02-211-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BTW, select works quite faster then find_all: require 'benchmark' n = [1]*100_000_000 Benchmark.bm do |x| x.report { n.select { |a| a > 1 } } x.report { n.find_all { |a| a > 1 } } end user system total real 7.590000 0.010000 7.600000 ( 7.927171) 9.650000 0.010000 9.660000 ( 9.634406)
* | | Merge pull request #4023 from pacoguzman/update-changelogsXavier Noria2012-02-257-11/+480
|\ \ \ | | | | | | | | Update changelogs with rails 3.0-stable branch info
| * | | Update changelogs with rails 3.0-stable branch infoPaco Guzman2012-02-257-11/+480
|/ / /
* | | Merge pull request #5163 from kennyj/fix_5119José Valim2012-02-251-6/+4
|\ \ \ | | | | | | | | Remove wrong and redundant code.
| * | | Remove wrong and redundant code.kennyj2012-02-251-6/+4
|/ / /
* | | Merge pull request #5161 from arunagw/put_patch_build_fixJosé Valim2012-02-241-1/+7
|\ \ \ | | | | | | | | build fixed -- put and patch both are allowed for update
| * | | put and patch both are allowed for updateArun Agrawal2012-02-251-1/+7
|/ / /
* | | fixes a test: rake routes now includes PATCH for resourcesXavier Noria2012-02-241-0/+1
| | |
* | | use regular ruby for fewer method calls. we do not need :gift:s!Aaron Patterson2012-02-241-1/+4
| | |
* | | consistently mention first patch, then putXavier Noria2012-02-2410-29/+29
| | | | | | | | | | | | | | | | | | There was a mix, sometimes patch first, sometimes put first. Use always patch first, since this is going to be the primary verb for updates.
* | | uses PATCH for the forms of persisted records, and routes PATCH and PUT to ↵Xavier Noria2012-02-2416-122/+91
| | | | | | | | | | | | the update action of resources
* | | decouples the implementation of the inflector from its test suiteXavier Noria2012-02-242-73/+73
| | | | | | | | | | | | | | | | | | | | | | | | Trying alternative implementations of the inflections is hard because the suite is coupled with the current one, setting ivars by hand etc. This commit relies on initialize_dup, as long as you maintain that one you can tweak the implementation.
* | | removes the reconnect key from the database.yml generated for MySQLXavier Noria2012-02-241-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reconnect flag does not play nicely with transactions and so it is of little use in Rails applications. Thus, albeit supported by mysql2, it does not deserve such a prominent place in the generated database.yml, which should be a representative config example. Note that the flag is false by default. Advanced users know from mysql2 docs that the flag is available.
* | | explains why reconnect is false by default in the database.yml generated for ↵Xavier Noria2012-02-241-1/+10
| | | | | | | | | | | | MySQL
* | | removes verify_active_connections!Xavier Noria2012-02-242-16/+1
| | | | | | | | | | | | | | | | | | | | | The method verify_active_connections! was used in the old days (up to 2.1 I think) by the dispatcher to verify the connections, but nowadays we do that in a different way and this method is obsolete.
* | | Merge pull request #5144 from nashby/input-name-nilAaron Patterson2012-02-242-3/+8
|\ \ \ | | | | | | | | correct fetching :name option in form fields
| * | | correct fetching :name option in form fieldsVasiliy Ermolovich2012-02-232-3/+8
| | | |
* | | | Merge pull request #5143 from mguterl/update_running_unit_tests_docVijay Dev2012-02-231-1/+1
|\ \ \ \ | |/ / / |/| | | Update with new task names for building mysql and postgresql databases
| * | | Update with new task names for building mysql and postgresql databasesMichael Guterl2012-02-231-1/+1
|/ / /
* | | Merge pull request #5139 from mhfs/remove_next_migration_numberJosé Valim2012-02-232-17/+0
|\ \ \ | | | | | | | | Remove unused implementation of next_migration_number
| * | | Remove unused implementation of next_migration_numberMarcelo Silveira2012-02-232-17/+0
| | | |
* | | | Document the :host option for force_sslAndrew White2012-02-231-0/+1
| | | |
* | | | Merge pull request #5140 from fbuenemann/fix/autoflush-wrong-templateSantiago Pastorino2012-02-232-3/+3
|\ \ \ \ | | | | | | | | | | Move config.autoflush_log to correct template
| * | | | Use consistent whitespace for commented options.Felix Bünemann2012-02-231-1/+1
| | | | |
| * | | | Move config.autoflush_log to correct template.Felix Bünemann2012-02-232-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | This accidentally ended up in the development template instead of the production template, where it makes most sense.
* | | | Update documentation for force_ssl - closes #5023.Andrew White2012-02-232-1/+26
| | | |
* | | | SSL should not be disabled by default in any environment.Pat Allan2012-02-232-15/+1
|/ / /
* | | Avoid inspecting the whole route set, closes #1525José Valim2012-02-231-0/+6
| | |
* | | Merge pull request #5138 from avakhov/remove-unused-global-varJosé Valim2012-02-231-2/+0
|\ \ \ | | | | | | | | Remove unused global variable in controller filters test
| * | | Remove unused global variable in controller filters testAlexey Vakhov2012-02-231-2/+0
| | | |
* | | | Merge pull request #5137 from avakhov/remove-skip-filter-block-paramJosé Valim2012-02-231-7/+7
|\ \ \ \ | |/ / / |/| | | Remove skip_filter block param
| * | | Remove skip_filter block paramAlexey Vakhov2012-02-231-7/+7
|/ / /
* | | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
|\ \ \ | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
| * | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2 #5022johndouthat2012-02-181-2/+1
| | | |
* | | | Merge pull request #4998 from fbuenemann/feature/configurable-log-flushingAaron Patterson2012-02-223-2/+6
|\ \ \ \ | | | | | | | | | | Make automatic log flushing configurable
| * | | | Always default to flushing enabledFelix Bünemann2012-02-232-2/+2
| | | | |
| * | | | Advertise autoflush option in production templateFelix Bünemann2012-02-231-0/+3
| | | | |