aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5199 from gabehollombe/masterXavier Noria2012-02-281-2/+3
|\ | | | | The language for describing how to configure ActionController::Base.asset_host could be clearer
| * Change asset_host config language to be more helpful and accurateGabe Hollombe2012-02-281-2/+3
| |
* | Merge pull request #5197 from lest/patch-4José Valim2012-02-271-6/+0
|\ \ | |/ |/| remove unnecessary code
| * remove unnecessary codeSergey Nartimov2012-02-281-6/+0
| | | | | | | | | | it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8 but isn't useful anymore as corresponding tests pass without it
* | Revert "only mutate the scope object in the `bind` method"Aaron Patterson2012-02-271-1/+1
| | | | | | | | This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966.
* | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
| |
* | only mutate the scope object in the `bind` methodAaron Patterson2012-02-271-1/+1
| |
* | bind value creation refactoringAaron Patterson2012-02-271-4/+10
|/
* removing dead codeAaron Patterson2012-02-271-3/+2
|
* use bind values for join columnsAaron Patterson2012-02-276-12/+36
|
* Merge pull request #5191 from rafaelfranca/fix-393Aaron Patterson2012-02-273-38/+38
|\ | | | | Add a new line after the textarea opening tag.
| * Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-273-38/+38
| | | | | | | | Closes #393
* | Merge pull request #5168 from kennyj/fix_5152Aaron Patterson2012-02-272-1/+6
|\ \ | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152
| * | Remove NULLS FIRST/LAST. closes #5152kennyj2012-02-252-1/+6
| | |
* | | Merge pull request #5173 from kennyj/fix_3931-2Aaron Patterson2012-02-273-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.kennyj2012-02-263-12/+23
| | | |
* | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bugAaron Patterson2012-02-271-1/+1
| | | | | | | | | | | | | | | | Binary mode window bug
* | | | Merge pull request #5192 from amatsuda/rdoc_task_19José Valim2012-02-272-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.9Akira Matsuda2012-02-272-14/+3
|/ / /
* | | Merge pull request #5185 from rafaelfranca/fix-collection_helpersJosé Valim2012-02-263-37/+76
|\ \ \ | | | | | | | | Fix collection helpers
| * | | Fix collection_check_boxes and collection_radio_buttons when using localRafael Mendonça França2012-02-262-0/+39
| | | | | | | | | | | | | | | | variables in the form builder
| * | | Add documentation to object method of CollectionHelpers::BuilderRafael Mendonça França2012-02-261-6/+6
| | | |
| * | | Move all the helpers to protected sectionRafael Mendonça França2012-02-261-31/+31
|/ / /
* | | updates the new default pool size in some additional placesXavier Noria2012-02-263-7/+17
| | |
* | | let the connection pool of new applications have size 1 rather than 5Xavier Noria2012-02-264-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 parametersAndrew White2012-02-261-2/+27
| | |
* | | Merge pull request #5174 from nashby/safe-concatJosé Valim2012-02-251-3/+4
|\ \ \ | | | | | | | | use content_tag instead of strings
| * | | use content_tag instead stringsVasiliy Ermolovich2012-02-251-3/+4
|/ / /
* | | A guide for upgrading Rails [ci skip]Vijay Dev2012-02-252-0/+169
| | |
* | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 11:20:45 +0000