Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Mikel Lindsaar | 2010-02-03 | 2 | -2/+2 |
|\ | | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile | ||||
| * | Doc Rails -> docrails | Xavier Noria | 2010-02-03 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2010-02-03 | 2 | -10/+18 |
| |\ | |||||
| | * | Remove a Rails 2 convention from namespaced routes | James Miller | 2010-02-02 | 1 | -1/+1 |
| | | | |||||
| * | | checking guides regeneration, should be out before 9am | Xavier Noria | 2010-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | Updating warning at the top | Mikel Lindsaar | 2010-02-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fixed up i18n info on release notes | Mikel Lindsaar | 2010-02-03 | 1 | -2/+2 |
| | | |||||
* | | Fixing all the 'script' references | Mikel Lindsaar | 2010-02-03 | 1 | -2/+7 |
| | | |||||
* | | Adding note about not being final and we want contributions | Mikel Lindsaar | 2010-02-03 | 1 | -1/+1 |
| | | |||||
* | | Fixing up the idea of bundle and freezing gems | Mikel Lindsaar | 2010-02-03 | 1 | -1/+3 |
| | | |||||
* | | Updated release notes | Mikel Lindsaar | 2010-02-03 | 1 | -4/+5 |
|/ | |||||
* | mention Object before Class | Xavier Noria | 2010-02-03 | 1 | -1/+1 |
| | |||||
* | ends_with is not a plural | Xavier Noria | 2010-02-03 | 1 | -1/+1 |
| | |||||
* | Add docs for Railtie, Engine, Plugin and Application. | José Valim | 2010-02-02 | 6 | -62/+265 |
| | |||||
* | this 2nd test should be alive in rails.info sometime before 12pm | Xavier Noria | 2010-02-02 | 1 | -1/+1 |
| | |||||
* | this test should be alive in rails.info at 9:30 | Xavier Noria | 2010-02-02 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 29 | -345/+286 |
|\ | | | | | | | | | | | | | | | Conflicts: activemodel/README activemodel/lib/active_model/errors.rb activemodel/lib/active_model/serialization.rb railties/guides/source/3_0_release_notes.textile | ||||
| * | Make rdoc match current API | Sam Ruby | 2010-02-02 | 1 | -105/+47 |
| | | | | | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> | ||||
| * | Resolve view paths correctly on CygWin | Sam Ruby | 2010-02-02 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> | ||||
| * | Fixed --dev flag for new bundler | Mikel Lindsaar | 2010-02-02 | 3 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 87 | -463/+580 |
| |\ | |||||
| | * | Update the Gemfile and CI build | Carl Lerche | 2010-02-01 | 2 | -2/+1 |
| | | | |||||
| * | | Xavier's edits | Mikel Lindsaar | 2010-02-02 | 1 | -42/+43 |
| | | | |||||
| * | | Adding Release Notes 3.0 | Mikel Lindsaar | 2010-02-01 | 1 | -0/+487 |
| | | | |||||
| * | | Updates to output and warning on being for Rails 3.0 | Mikel Lindsaar | 2010-02-01 | 1 | -12/+20 |
| | | | |||||
| * | | Completely updated the ActionMailer guide | Mikel Lindsaar | 2010-02-01 | 1 | -184/+189 |
| | | | |||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 15 | -15/+15 |
| | | | |||||
| * | | Full update on ActiveModel documentation | Mikel Lindsaar | 2010-02-01 | 10 | -70/+562 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Mikel Lindsaar | 2010-02-02 | 108 | -574/+804 |
|\ \ \ | |||||
| * | | | update html_safe calls in guides generation | Xavier Noria | 2010-02-02 | 2 | -11/+5 |
| | | | | |||||
| * | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 105 | -562/+763 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Run bundle exec rake instead of bin/rake during CI | Carl Lerche | 2010-02-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | [PATCH] remove geminstaller dependency from ci build | Carl Lerche | 2010-02-01 | 2 | -14/+5 |
| | | | | |||||
| | * | | Make AM test suite green. | José Valim | 2010-02-01 | 2 | -2/+3 |
| | | | | |||||
| | * | | Add the database adapter in the generated Gemfile | Carl Lerche | 2010-02-01 | 2 | -0/+20 |
| | | | | |||||
| | * | | failing tests in multibyte_chars_test.rb fixed | Santiago Pastorino | 2010-02-01 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| | * | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-02-01 | 25 | -83/+198 |
| | |\ \ | |||||
| | | * | | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 22 | -83/+113 |
| | | | | | |||||
| | | * | | Introduce class_attribute to declare inheritable class attributes. Writing ↵ | Jeremy Kemper | 2010-02-01 | 3 | -0/+85 |
| | | | | | | | | | | | | | | | | | | | | an attribute on a subclass behaves just like overriding the superclass reader method. Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute. | ||||
| | * | | | Deprecate AC configuration values which were moved to Rack. | José Valim | 2010-02-01 | 7 | -17/+41 |
| | | | | | |||||
| | * | | | Add config.generators.fallbacks. | José Valim | 2010-02-01 | 3 | -2/+15 |
| | |/ / | |||||
| | * | | Add support for compile-time <%= raw %> | Yehuda Katz | 2010-01-31 | 2 | -23/+39 |
| | | | | |||||
| | * | | Deleted all references to ActionView::SafeBuffer in favor of ↵ | Santiago Pastorino | 2010-01-31 | 4 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::SafeBuffer Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| | * | | action_view/safe_buffer is no longer valid | Santiago Pastorino | 2010-01-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| | * | | action_view is requiring the deleted action_view/erb/util.rb file | Santiago Pastorino | 2010-01-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| | * | | Update the Ci build script | Carl Lerche | 2010-01-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update the generated Gemfile and config/boot.rb to work with bundler 0.9 | Carl Lerche | 2010-01-31 | 2 | -11/+16 |
| | | | | |||||
| | * | | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 31 | -195/+178 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. | ||||
| | * | | Have rails depend on bundler | Carl Lerche | 2010-01-31 | 1 | -0/+1 |
| | | | | |||||
| | * | | Update the CI geminstaller to pull in the correct version of bundler | Carl Lerche | 2010-01-31 | 1 | -1/+1 |
| | | | |