aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/lifo/docrailsXavier Noria2011-08-1715-26/+5
|\
| * Updates to remove extra whitespaces and notably fix a whitespace issue with ↵Jeff Dutil2011-08-1610-22/+1
| | | | | | | | ajax_on_rails causing a code block not to render the entire block properly.
| * Fix typo in i18n.textile header and remove extra whitespace.Jeff Dutil2011-08-161-2/+1
| |
| * Fix ruby typo to correctly render code block in initializer.textileJeff Dutil2011-08-162-2/+2
| |
| * Fix spacing in plugins.textile to fix html rendering and remove extra ↵Jeff Dutil2011-08-162-1/+2
| | | | | | | | whitespace from security.textile
* | fixes generation of the AR querying guideXavier Noria2011-08-171-2/+2
| |
* | Merge pull request #2551 from rgo/remove-blank-spaces-application-cssXavier Noria2011-08-171-3/+3
|\ \ | | | | | | Cleanup application.css
| * | Cleanup application.cssRafa García2011-08-171-3/+3
|/ /
* | making the order more clear, adding linux distros mailing lists to our ccAaron Patterson2011-08-161-10/+13
| |
* | adding lessons learned so I do not make the same mistake twiceAaron Patterson2011-08-161-0/+5
| |
* | Properly escape glob characters.Aaron Patterson2011-08-163-3/+27
| |
* | properly escape html to avoid invalid utf8 causing XSS attacksAaron Patterson2011-08-162-1/+8
| |
* | Tags with invalid names should also be stripped in order to preventAaron Patterson2011-08-162-1/+8
| | | | | | | | XSS attacks. Thanks Sascha Depold for the report.
* | prevent sql injection attacks by escaping quotes in column namesAaron Patterson2011-08-164-3/+20
| |
* | adding security email addressAaron Patterson2011-08-161-2/+1
| |
* | Merge branch 'master' of github.com:rails/railsXavier Noria2011-08-163-16/+9
|\ \
| * | Use lazy load hooks to set parameter wrapping configuration. This means that ↵Jon Leighton2011-08-163-16/+9
| | | | | | | | | | | | it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.
* | | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-1612-81/+124
|\ \ \ | |/ / |/| / | |/
| * Fix formatting of active_record_validations_callbacks.textile so guide will ↵Jeff Dutil2011-08-161-2/+2
| | | | | | | | render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view
| * document Array#append and Array#prepend methods in AS guideVijay Dev2011-08-161-0/+24
| |
| * Document Hash#extract!.Sebastian Martinez2011-08-152-0/+14
| |
| * Fixed mistakes in layouts/rendering guide about yieldJacob Mattingley2011-08-151-2/+2
| | | | | | | | | | yield(:unspecified_block) actually returns true even if :unspecified_block never exists. This means you can't use the form yield(:unspecified_block) or yield.
| * Updates to Asset Pipeline GuideJESii2011-08-151-45/+45
| | | | | | | | | | | | | | | | Grammar/syntax/style changes: 1. Changed all 'we' to 'you' 2. Corrected typos 3. Make consistent styline (e.g., dashes & double-dash usage) 4. Change use of future tense (will...) to present tense (easier to read).
| * assets guide - add info about require_directory, minor rephrasingsVijay Dev2011-08-151-5/+7
| |
| * minor changes in app templates guideVijay Dev2011-08-151-7/+1
| |
| * Merge pull request #58 from cameel/fix-set_autoload_path-typoKamil Śliwak2011-08-141-1/+1
| |\ | | | | | | Fix a typo in 'Configuring Rails Applications' guide
| | * Fix a typo in 'Configuring Rails Applications' guide Kamil Śliwak2011-08-151-1/+1
| |/ | | | | - The initializer is called `set_autoload_paths`, not `set_autoload_path`. See https://github.com/rails/rails/blob/master/railties/lib/rails/engine.rb#L506
| * TypoRaul Murciano2011-08-141-1/+1
| |
| * Action Mailer guide: mention how to use :cc and :bcc parameters.Raul Murciano2011-08-141-0/+2
| |
| * Action Mailer guide update: the :to parameter now supports both String and ↵Raul Murciano2011-08-141-2/+2
| | | | | | | | Array values to indicate recipients.
| * rephrase how the verbose methods in a migration workVijay Dev2011-08-141-3/+3
| |
| * document alias for rails runnerVijay Dev2011-08-141-1/+2
| |
| * added a few more items in the release notesVijay Dev2011-08-141-2/+8
| |
| * fix misleading comment (originally made by Tate Johnson, we lost this commit ↵Vijay Dev2011-08-141-1/+1
| | | | | | | | while porting to the rails repo)
| * Active Model instead of ActiveModel.Hendy Tanata2011-08-141-1/+1
| |
| * Use fixed-width font where necessary.Hendy Tanata2011-08-141-12/+12
| |
| * Fix tt tag appearing on 3_1_release_notes guide.Hendy Tanata2011-08-141-1/+1
| |
* | prefer ends_with? over slicingXavier Noria2011-08-161-1/+2
| |
* | AS guide: document in Module#delegate that the method must be public in the ↵Xavier Noria2011-08-161-1/+3
| | | | | | | | target
* | Fix assets tests in railtiesJon Leighton2011-08-162-5/+7
| |
* | Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb. Use ↵Jon Leighton2011-08-161-5/+7
| | | | | | | | config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup.
* | In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put ↵Jon Leighton2011-08-163-14/+26
| | | | | | | | under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.
* | Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"Santiago Pastorino2011-08-161-0/+1
| | | | | | | | | | This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.
* | Merge pull request #2543 from htanata/unused_require_in_ar_testSantiago Pastorino2011-08-161-1/+0
|\ \ | | | | | | Remove unused require in activerecord/test/cases/attribute_methods_test.rb
| * | Remove unused require.Hendy Tanata2011-08-161-1/+0
|/ /
* | Fix tzinfo require (it broke ↵Jon Leighton2011-08-161-6/+13
| | | | | | | | test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties)
* | Fix wrap_parameters initializer templateJon Leighton2011-08-161-1/+1
| |
* | Be more lazy about creating time zone objects. Decreases startup time by ↵Jon Leighton2011-08-161-2/+13
| | | | | | | | about 10%. (#734)
* | Don't refer to ActionController::Base in the wrap_parameters initializer - ↵Jon Leighton2011-08-163-1/+10
| | | | | | | | use config object instead. Cuts about 15% off the load time. (#734)
* | Bump arel dependencyJon Leighton2011-08-151-1/+1
| |