aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2010-02-032-10/+18
|\
| * Remove a Rails 2 convention from namespaced routesJames Miller2010-02-021-1/+1
| * Fixed up i18n info on release notesMikel Lindsaar2010-02-031-2/+2
| * Fixing all the 'script' referencesMikel Lindsaar2010-02-031-2/+7
| * Adding note about not being final and we want contributionsMikel Lindsaar2010-02-031-1/+1
| * Fixing up the idea of bundle and freezing gemsMikel Lindsaar2010-02-031-1/+3
| * Updated release notesMikel Lindsaar2010-02-031-4/+5
* | checking guides regeneration, should be out before 9amXavier Noria2010-02-031-1/+1
|/
* mention Object before ClassXavier Noria2010-02-031-1/+1
* ends_with is not a pluralXavier Noria2010-02-031-1/+1
* Add docs for Railtie, Engine, Plugin and Application.José Valim2010-02-026-62/+265
* this 2nd test should be alive in rails.info sometime before 12pmXavier Noria2010-02-021-1/+1
* this test should be alive in rails.info at 9:30Xavier Noria2010-02-021-1/+1
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-0229-345/+286
|\
| * Make rdoc match current APISam Ruby2010-02-021-105/+47
| * Resolve view paths correctly on CygWinSam Ruby2010-02-021-1/+1
| * Fixed --dev flag for new bundlerMikel Lindsaar2010-02-023-5/+5
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-0287-463/+580
| |\
| | * Update the Gemfile and CI buildCarl Lerche2010-02-012-2/+1
| * | Xavier's editsMikel Lindsaar2010-02-021-42/+43
| * | Adding Release Notes 3.0Mikel Lindsaar2010-02-011-0/+487
| * | Updates to output and warning on being for Rails 3.0Mikel Lindsaar2010-02-011-12/+20
| * | Completely updated the ActionMailer guideMikel Lindsaar2010-02-011-184/+189
| * | Updating copyright dates on all licensesMikel Lindsaar2010-02-0115-15/+15
| * | Full update on ActiveModel documentationMikel Lindsaar2010-02-0110-70/+562
* | | Merge branch 'master' of github.com:lifo/docrailsMikel Lindsaar2010-02-02108-574/+804
|\ \ \
| * | | update html_safe calls in guides generationXavier Noria2010-02-022-11/+5
| * | | Merge remote branch 'mainstream/master'Pratik Naik2010-02-01105-562/+763
| |\ \ \ | | | |/ | | |/|
| | * | Run bundle exec rake instead of bin/rake during CICarl Lerche2010-02-011-1/+1
| | * | [PATCH] remove geminstaller dependency from ci buildCarl Lerche2010-02-012-14/+5
| | * | Make AM test suite green.José Valim2010-02-012-2/+3
| | * | Add the database adapter in the generated GemfileCarl Lerche2010-02-012-0/+20
| | * | failing tests in multibyte_chars_test.rb fixedSantiago Pastorino2010-02-011-11/+11
| | * | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-02-0125-83/+198
| | |\ \
| | | * | Convert to class_attributeJeremy Kemper2010-02-0122-83/+113
| | | * | Introduce class_attribute to declare inheritable class attributes. Writing an...Jeremy Kemper2010-02-013-0/+85
| | * | | Deprecate AC configuration values which were moved to Rack.José Valim2010-02-017-17/+41
| | * | | Add config.generators.fallbacks.José Valim2010-02-013-2/+15
| | |/ /
| | * | Add support for compile-time <%= raw %>Yehuda Katz2010-01-312-23/+39
| | * | Deleted all references to ActionView::SafeBuffer in favor of ActiveSupport::S...Santiago Pastorino2010-01-314-7/+5
| | * | action_view/safe_buffer is no longer validSantiago Pastorino2010-01-311-1/+0
| | * | action_view is requiring the deleted action_view/erb/util.rb fileSantiago Pastorino2010-01-311-1/+0
| | * | Update the Ci build scriptCarl Lerche2010-01-311-1/+1
| | * | Update the generated Gemfile and config/boot.rb to work with bundler 0.9Carl Lerche2010-01-312-11/+16
| | * | For performance reasons, you can no longer call html_safe! on Strings. Instea...Yehuda Katz2010-01-3131-195/+178
| | * | Have rails depend on bundlerCarl Lerche2010-01-311-0/+1
| | * | Update the CI geminstaller to pull in the correct version of bundlerCarl Lerche2010-01-311-1/+1
| | * | Get rails tests running on bundler 0.9Carl Lerche2010-01-3111-92/+46
| | * | Bump arel dependency to 0.2.0 from 0.2.preJeremy Kemper2010-01-313-3/+2
| | |/
| | * UJS documentation.Stefan Penner2010-01-313-33/+78