aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-06-2033-233/+317
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * I18n.reload! is only called if any of the locale files actually changed.José Valim2010-06-202-108/+114
| |
| * Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader.José Valim2010-06-202-49/+10
| |
| * Improve documentation for add_lib_to_load_paths!José Valim2010-06-201-3/+16
| |
| * Add test for migration generator with name not starting with add or remove. ↵rohit2010-06-201-0/+15
| | | | | | | | | | | | [#4835 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Added absolute path for config.ru as well. Turns out this is also needed to ↵Ryan Duryea2010-06-201-1/+2
| | | | | | | | | | | | | | | | fix the daemon issue under ruby 1.8.7 [#4531 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Pass rack the absolute path of server's pid fileRyan Duryea2010-06-201-1/+1
| | | | | | | | | | | | | | | | | | When running as a daemon, rack will cd to "/" and paths relative to the root of the rails app aren't valid when rack is setting up. Because of this, "rails server -d" was failing silently when trying to write it's pid file Signed-off-by: José Valim <jose.valim@gmail.com>
| * remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-207-0/+0
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Strip trailing whitespace from generated applications [#4905 state:resolved]Chris Griego2010-06-205-8/+8
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵Andrew White2010-06-207-5/+23
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-201-24/+36
| |\
| | * Adds a few connection parameters for IBM databases.Antonio Cangiano2010-06-181-24/+36
| | | | | | | | | | | | | | | | | | [#3852] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Clear DescendantsTracker on each request.José Valim2010-06-195-35/+77
| |/
| * Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-171-0/+2
| |\
| | * use RDoc 2.2 to generate the documentation of individual componentsXavier Noria2010-06-161-0/+2
| | |
| * | Add a failing test for ticket #4874José Valim2010-06-171-0/+14
| |/
* | Generators Guide: Typo of my ownrspeicher2010-06-201-1/+1
| |
* | Generators Guide: Style/grammar changes and minor typosrspeicher2010-06-201-24/+24
| |
* | Generators Guide: Make titles conform to conventionsrspeicher2010-06-201-8/+8
| |
* | Generators Guide: Remove semicolons from prologue, as none of the other ↵rspeicher2010-06-201-6/+6
| | | | | | | | guides had them
* | cleaner output for rake validate_guides: dot-style, brief summary and ↵Jaime Iniesta2010-06-181-6/+29
| | | | | | | | detailed description below
* | Merge remote branch 'origin/master'Bryan Woods2010-06-162-21/+21
|\ \
| * | Clarify language around list of finder methods.kaygee2010-06-161-2/+2
| | | | | | | | | | | | Clarify that finder methods return an instance of class ActiveRecord::Relation.
| * | Fix incorrect pluralization in 'These methods allows you to pass arguments...'.kaygee2010-06-161-1/+1
| | |
| * | Guides: AS Core Extensions, behaviour => behaviorrohit2010-06-161-4/+4
| | |
| * | Guides: AS Core Extensions, fixed a few typos.rohit2010-06-161-19/+19
| | |
* | | Guides: renaming to active_record_validations_callbacks for consistency and ↵Bryan Woods2010-06-165-5/+5
|/ / | | | | | | updating links to reflect new path
* | Fixing some minor typos, grammar, accuracy, and spacing issues in Active ↵Bryan Woods2010-06-151-15/+15
| | | | | | | | Record Validations Callbacks guide
* | Routing guide - Minor typo/consistency changesrspeicher2010-06-141-8/+8
| |
* | Active Record Basics - Separate and clarify the explanations for ↵rspeicher2010-06-141-2/+4
| | | | | | | | created_at/on and updated_at/on
* | Active Record Basics - Style and grammar editsrspeicher2010-06-141-17/+21
|/ | | | | - "i.e." should be "e.g." in these cases, and include the comma - Newline consistency before/after Ruby blocks - Conform to the apparent guide standard of "Active Record" over "ActiveRecord"
* edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-146-6/+6
| | | | not "ActiveRecord"
* Fix minor typos and inconsistencies, and one minor grammar changerspeicher2010-06-141-6/+6
|
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-145-6/+21
|\
| * Tidy up generators based on latest change on AM.José Valim2010-06-132-3/+3
| |
| * Create mailers folder when starting a new rails appLawrence Curtis2010-06-121-0/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Test create mailers folder when starting a new appDamien Mathieu2010-06-121-0/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Support ruby 1.8.7 and 1.9.2 (and development versions)Jeremy Kemper2010-06-111-3/+17
| |
* | updated active record querying guide to standardize on first_name for ClientDerek Willis2010-06-131-1/+1
| |
* | updated active record querying guide to standardize on first_name for ClientDerek Willis2010-06-131-12/+12
| |
* | Remove unneeded .rb suffix on require statementsSantiago Pastorino2010-06-131-13/+13
| |
* | Routing guide: Fix pathJosiah Ivey2010-06-131-1/+1
| |
* | Rails Guides: AR Querying, .count should be at the end as it returns a ↵Rohit Arondekar2010-06-131-1/+1
| | | | | | | | number. [#4811 state:resolved]
* | gems versions bumped upSantiago Pastorino2010-06-131-20/+20
|/
* Merge remote branch 'docrails/master'Xavier Noria2010-06-123-3/+3
|\
| * grammar fixesXavier Noria2010-06-112-2/+2
| |
| * fixing typoNeeraj Singh2010-06-101-1/+1
| |
* | AS guide: updates docs on date calculations to reflect a0a6cc2Xavier Noria2010-06-121-5/+21
| |
* | Single ruby version requirement messageJeremy Kemper2010-06-112-10/+5
|/
* abort generation/booting on Ruby 1.9.1Xavier Noria2010-06-105-4/+13
|