Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Revert "Remove meaningless code from the examples" of AutosaveAssociation | Dimitar Dimitrov | 2012-02-22 | 1 | -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 Dimitrov | 2012-02-22 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | * Fix typos * Remove meaningless code from the examples | |||||
| * | | | Merge pull request #84 from pawel2105/master | pawel2105 | 2012-02-21 | 1 | -0/+20 | |
| |\ \ \ | | | | | | | | | | | Database pooling configuration | |||||
| | * | | | Added database pooling sub-section to the 'configuring' guide | Cynical Grinch | 2012-02-21 | 1 | -0/+20 | |
| |/ / / | ||||||
| * | | | Fix AbstractController#controller_path doc | Alexey Vakhov | 2012-02-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #5117 from nashby/form-option-refactor | José Valim | 2012-02-25 | 1 | -17/+11 | |
|\ \ \ \ | | | | | | | | | | | FormOptionsHelper refactor | |||||
| * | | | | refactor option_text_and_value and option_value_selected? methods | Vasiliy Ermolovich | 2012-02-21 | 1 | -10/+3 | |
| | | | | | ||||||
| * | | | | refactor time_zone_options_for_select | Vasiliy Ermolovich | 2012-02-21 | 1 | -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-changelogs | Xavier Noria | 2012-02-25 | 7 | -11/+480 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Update changelogs with rails 3.0-stable branch info | |||||
| * | | | | Update changelogs with rails 3.0-stable branch info | Paco Guzman | 2012-02-25 | 7 | -11/+480 | |
|/ / / / | ||||||
* | | | | Merge pull request #5163 from kennyj/fix_5119 | José Valim | 2012-02-25 | 1 | -6/+4 | |
|\ \ \ \ | | | | | | | | | | | Remove wrong and redundant code. | |||||
| * | | | | Remove wrong and redundant code. | kennyj | 2012-02-25 | 1 | -6/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #5161 from arunagw/put_patch_build_fix | José Valim | 2012-02-24 | 1 | -1/+7 | |
|\ \ \ \ | | | | | | | | | | | build fixed -- put and patch both are allowed for update | |||||
| * | | | | put and patch both are allowed for update | Arun Agrawal | 2012-02-25 | 1 | -1/+7 | |
|/ / / / | ||||||
* | | | | fixes a test: rake routes now includes PATCH for resources | Xavier Noria | 2012-02-24 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | use regular ruby for fewer method calls. we do not need :gift:s! | Aaron Patterson | 2012-02-24 | 1 | -1/+4 | |
| | | | | ||||||
* | | | | consistently mention first patch, then put | Xavier Noria | 2012-02-24 | 10 | -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 Noria | 2012-02-24 | 16 | -122/+91 | |
| | | | | | | | | | | | | | | | | the update action of resources | |||||
* | | | | decouples the implementation of the inflector from its test suite | Xavier Noria | 2012-02-24 | 2 | -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 MySQL | Xavier Noria | 2012-02-24 | 1 | -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 Noria | 2012-02-24 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | MySQL | |||||
* | | | | removes verify_active_connections! | Xavier Noria | 2012-02-24 | 2 | -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-nil | Aaron Patterson | 2012-02-24 | 2 | -3/+8 | |
|\ \ \ \ | | | | | | | | | | | correct fetching :name option in form fields | |||||
| * | | | | correct fetching :name option in form fields | Vasiliy Ermolovich | 2012-02-23 | 2 | -3/+8 | |
| | | | | | ||||||
* | | | | | Merge pull request #5143 from mguterl/update_running_unit_tests_doc | Vijay Dev | 2012-02-23 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Update with new task names for building mysql and postgresql databases | |||||
| * | | | | Update with new task names for building mysql and postgresql databases | Michael Guterl | 2012-02-23 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #5139 from mhfs/remove_next_migration_number | José Valim | 2012-02-23 | 2 | -17/+0 | |
|\ \ \ \ | | | | | | | | | | | Remove unused implementation of next_migration_number | |||||
| * | | | | Remove unused implementation of next_migration_number | Marcelo Silveira | 2012-02-23 | 2 | -17/+0 | |
| | | | | | ||||||
* | | | | | Document the :host option for force_ssl | Andrew White | 2012-02-23 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #5140 from fbuenemann/fix/autoflush-wrong-template | Santiago Pastorino | 2012-02-23 | 2 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Move config.autoflush_log to correct template | |||||
| * | | | | | Use consistent whitespace for commented options. | Felix Bünemann | 2012-02-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Move config.autoflush_log to correct template. | Felix Bünemann | 2012-02-23 | 2 | -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 White | 2012-02-23 | 2 | -1/+26 | |
| | | | | | ||||||
* | | | | | SSL should not be disabled by default in any environment. | Pat Allan | 2012-02-23 | 2 | -15/+1 | |
|/ / / / | ||||||
* | | | | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Merge pull request #5138 from avakhov/remove-unused-global-var | José Valim | 2012-02-23 | 1 | -2/+0 | |
|\ \ \ \ | | | | | | | | | | | Remove unused global variable in controller filters test | |||||
| * | | | | Remove unused global variable in controller filters test | Alexey Vakhov | 2012-02-23 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | Merge pull request #5137 from avakhov/remove-skip-filter-block-param | José Valim | 2012-02-23 | 1 | -7/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove skip_filter block param | |||||
| * | | | | Remove skip_filter block param | Alexey Vakhov | 2012-02-23 | 1 | -7/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -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 #5022 | johndouthat | 2012-02-18 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #4998 from fbuenemann/feature/configurable-log-flushing | Aaron Patterson | 2012-02-22 | 3 | -2/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | Make automatic log flushing configurable | |||||
| * | | | | | Always default to flushing enabled | Felix Bünemann | 2012-02-23 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Advertise autoflush option in production template | Felix Bünemann | 2012-02-23 | 1 | -0/+3 | |
| | | | | | | ||||||
| * | | | | | Make log autoflushing configurable | Felix Bünemann | 2012-02-23 | 2 | -2/+3 | |
|/ / / / / | ||||||
* | | | | | updates CHANGELOGs to register changes in 002713c | Xavier Noria | 2012-02-22 | 3 | -0/+21 | |
| | | | | | ||||||
* | | | | | add some tests, yay! | Aaron Patterson | 2012-02-22 | 1 | -0/+31 | |
| | | | | | ||||||
* | | | | | Merge pull request #5133 from rafaelfranca/fix-build | Aaron Patterson | 2012-02-22 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Only set ActionView configuration inside the on_load block | |||||
| * | | | | | Only set ActionView configuration inside the on_load block | Rafael Mendonça França | 2012-02-22 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5132 from rafaelfranca/fix-build | Aaron Patterson | 2012-02-22 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix routes inspection order |