Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use bind values for join columns | Aaron Patterson | 2012-02-27 | 6 | -12/+36 |
| | |||||
* | Merge pull request #5191 from rafaelfranca/fix-393 | Aaron Patterson | 2012-02-27 | 3 | -38/+38 |
|\ | | | | | Add a new line after the textarea opening tag. | ||||
| * | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 3 | -38/+38 |
| | | | | | | | | Closes #393 | ||||
* | | Merge pull request #5168 from kennyj/fix_5152 | Aaron Patterson | 2012-02-27 | 2 | -1/+6 |
|\ \ | | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152 | ||||
| * | | Remove NULLS FIRST/LAST. closes #5152 | kennyj | 2012-02-25 | 2 | -1/+6 |
| | | | |||||
* | | | Merge pull request #5173 from kennyj/fix_3931-2 | Aaron Patterson | 2012-02-27 | 3 | -12/+23 |
|\ \ \ | | | | | | | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again). | ||||
| * | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-26 | 3 | -12/+23 |
| | | | | |||||
* | | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Binary mode window bug | ||||
* | | | | Merge pull request #5192 from amatsuda/rdoc_task_19 | José Valim | 2012-02-27 | 2 | -14/+3 |
|\ \ \ \ | |_|_|/ |/| | | | no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9 | ||||
| * | | | ruby19: no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9 | Akira Matsuda | 2012-02-27 | 2 | -14/+3 |
|/ / / | |||||
* | | | Merge pull request #5185 from rafaelfranca/fix-collection_helpers | José Valim | 2012-02-26 | 3 | -37/+76 |
|\ \ \ | | | | | | | | | Fix collection helpers | ||||
| * | | | Fix collection_check_boxes and collection_radio_buttons when using local | Rafael Mendonça França | 2012-02-26 | 2 | -0/+39 |
| | | | | | | | | | | | | | | | | variables in the form builder | ||||
| * | | | Add documentation to object method of CollectionHelpers::Builder | Rafael Mendonça França | 2012-02-26 | 1 | -6/+6 |
| | | | | |||||
| * | | | Move all the helpers to protected section | Rafael Mendonça França | 2012-02-26 | 1 | -31/+31 |
|/ / / | |||||
* | | | updates the new default pool size in some additional places | Xavier Noria | 2012-02-26 | 3 | -7/+17 |
| | | | |||||
* | | | let the connection pool of new applications have size 1 rather than 5 | Xavier Noria | 2012-02-26 | 4 | -12/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The majority of Rails applications are multiprocess, people may wonder why rails new generates a default pool of 5, does my application need a connection pool of 5? By generating a default of 1 database.yml is much more clear, and with the comment people know what is the connection pool for, and they know it has to be bigger for multithread apps. | ||||
* | | | Adding tests for non-optional glob parameters | Andrew White | 2012-02-26 | 1 | -2/+27 |
| | | | |||||
* | | | Merge pull request #5174 from nashby/safe-concat | José Valim | 2012-02-25 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | use content_tag instead of strings | ||||
| * | | | use content_tag instead strings | Vasiliy Ermolovich | 2012-02-25 | 1 | -3/+4 |
|/ / / | |||||
* | | | A guide for upgrading Rails [ci skip] | Vijay Dev | 2012-02-25 | 2 | -0/+169 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-25 | 5 | -5/+24 |
|\ \ \ | |/ / |/| | | | | | | | | Conflicts: actionmailer/CHANGELOG.md | ||||
| * | | copy-edits [ci skip] | Vijay Dev | 2012-02-25 | 1 | -10/+8 |
| | | | |||||
| * | | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵ | Noah Hendrix | 2012-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | itself instead of other_money.amount | ||||
| * | | Fix typo in match :to docs | Justin Woodbridge | 2012-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | Cosmetic fixes in AM changelog | Alexey Vakhov | 2012-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | 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 |