Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-01 | 9 | -152/+142 |
|\ | | | | | | | | | Conflicts: railties/guides/source/contributing_to_ruby_on_rails.textile | ||||
| * | Removed so info about assigning to specific devs and adding tags. I don't ↵ | Mike Gehard | 2011-04-29 | 1 | -8/+2 |
| | | | | | | | | believe that you can do that in GitHub issues. Remove state:committed notes as they also don't exist in GitHub issues. | ||||
| * | Added missing word on guide | Sebastian Martinez | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | Upload patches is for LH, we use pull requests on GitHub now | Sebastian Martinez | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Dan Pickett | 2011-04-29 | 8 | -107/+110 |
| |\ | |||||
| | * | Edited railties/guides/source/routing.textile via GitHub | Stefan Rohlfing | 2011-04-28 | 1 | -2/+2 |
| | | | |||||
| | * | document the reorder method(fb215110401c70cfc7013c6e2ad5753fa4e374e9) | Vijay Dev | 2011-04-28 | 1 | -4/+31 |
| | | | |||||
| | * | update the Array#from behaviour changes - returns [] if index exceeds array ↵ | Vijay Dev | 2011-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | length | ||||
| | * | added the list of reversible commands in the newer migrations | Vijay Dev | 2011-04-26 | 1 | -2/+6 |
| | | | |||||
| | * | minor changes in migrations guide | Vijay Dev | 2011-04-26 | 1 | -7/+5 |
| | | | |||||
| | * | Change from `self.(up|down)` to `(up|down)` method | Prem Sichanugrist | 2011-04-26 | 2 | -9/+9 |
| | | | |||||
| | * | Update guide to use `change` method in various places after migration ↵ | Prem Sichanugrist | 2011-04-26 | 3 | -74/+48 |
| | | | | | | | | | | | | generator has changed. | ||||
| | * | Change examples in guide to reflect changes from XML -> JSON | Prem Sichanugrist | 2011-04-26 | 2 | -10/+10 |
| | | | |||||
| | * | indentation fixes | Vijay Dev | 2011-04-24 | 1 | -7/+7 |
| | | | |||||
| * | | update contributors guide to reflect GitHub use | Dan Pickett | 2011-04-29 | 1 | -37/+30 |
| | | | | | | | | | | | | | | | * outlines how to review pull requests * outlines how to issue pull requests * changed all references from LH => GH | ||||
* | | | Change from LH to github way of autoclosing issues | Santiago Pastorino | 2011-04-30 | 1 | -2/+2 |
| | | | |||||
* | | | Prototype and Scriptaculous are no longer vendored, but provided by ↵ | Xavier Noria | 2011-04-30 | 17 | -9594/+24 |
| | | | | | | | | | | | | prototype-rails from now on, also the -j option of the application generator is removed | ||||
* | | | Update jquery-ujs and prototype-ujs | Santiago Pastorino | 2011-04-29 | 2 | -160/+290 |
| | | | |||||
* | | | Make update_ujs task update the right files | Santiago Pastorino | 2011-04-29 | 1 | -2/+2 |
| | | | |||||
* | | | Include CSRF token in remote:true calls | David Heinemeier Hansson | 2011-04-29 | 1 | -1/+6 |
|/ / | |||||
* | | Fixed comment 'config.asset' => 'config.assets' | Brian Cardarella | 2011-04-29 | 1 | -1/+1 |
| | | |||||
* | | JavaScript expansions are ignored if the application uses the asset ↵ | Xavier Noria | 2011-04-29 | 1 | -0/+4 |
| | | | | | | | | pipeline, warn the user | ||||
* | | Relevant options closer together | David Heinemeier Hansson | 2011-04-27 | 1 | -4/+4 |
| | | |||||
* | | minor git sources formatting change in railties app_base.rb | Josh Kalderimis | 2011-04-27 | 1 | -3/+3 |
| | | |||||
* | | enable uglifier gem as new version of execjs is relased | Ganesh Kumar | 2011-04-27 | 2 | -2/+2 |
| | | |||||
* | | Prem fixes 1.9 engine test issue | David Heinemeier Hansson | 2011-04-26 | 1 | -1/+1 |
| | | |||||
* | | Merged pull request #279 from miloops/434d757. | José Valim | 2011-04-26 | 1 | -1/+1 |
|\ \ | | | | | | | Fix console to accept [environment] [options] as specified in docs. | ||||
| * | | Fix console to accept [environment] [options] as specified in docs. | Emilio Tagua | 2011-04-14 | 1 | -1/+1 |
| | | | |||||
* | | | jdbcpostgresql support added into template. | Vishnu Atrai | 2011-04-26 | 3 | -2/+57 |
| | | | |||||
* | | | Merged pull request #300 from arunagw/jdbc_test. | Aaron Patterson | 2011-04-25 | 4 | -1/+64 |
|\ \ \ | | | | | | | | | Start Adding jdbcmysql support to new rails template. | ||||
| * | | | Adding jdbcsqlite3 name in comment. | Arun Agrawal | 2011-04-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Looks more friendly. | Arun Agrawal | 2011-04-24 | 1 | -1/+2 |
| | | | | |||||
| * | | | jdbcsqlite3 support added into template. #jruby | Arun Agrawal | 2011-04-23 | 3 | -1/+26 |
| | | | | |||||
| * | | | Start Adding jdbcmysql support to new rails template. | Arun Agrawal | 2011-04-23 | 3 | -2/+39 |
| | | | | | | | | | | | | More will come for jruby app. | ||||
* | | | | Make ActionController::Base.modules_for_helpers and ↵ | Piotr Sarnacki | 2011-04-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | ActionController::Base.all_helpers_from_path public methods | ||||
* | | | | Explicitly define main_app proxy | Piotr Sarnacki | 2011-04-25 | 1 | -0/+4 |
| | | | | |||||
* | | | | Add Engine#helpers method which loads all the engine's helpers | Piotr Sarnacki | 2011-04-25 | 2 | -0/+84 |
| | | | | |||||
* | | | | Go with latest Sass directly | David Heinemeier Hansson | 2011-04-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix tests. | José Valim | 2011-04-25 | 2 | -7/+3 |
| | | | | |||||
* | | | | No need to check for both full and mountable. | Prem Sichanugrist | 2011-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | All mountable engine are considered `full?` already. | ||||
* | | | | Add `app/assets/images` directory to plugin new generator | Prem Sichanugrist | 2011-04-25 | 2 | -0/+14 |
| | | | | |||||
* | | | | Temporarily disable uglifier until a new version depending on execjs 0.2.0 ↵ | David Heinemeier Hansson | 2011-04-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | can be released (tomorrow?) | ||||
* | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2011-04-24 | 3 | -3/+42 |
|\ \ \ \ | |||||
| * | | | | added config.active_record.whitelist_attributes which creates an empty ↵ | Josh Kalderimis | 2011-04-24 | 3 | -3/+17 |
| | | | | | | | | | | | | | | | | | | | | whitelist of attributes available for mass assignment for all models in your app | ||||
| * | | | | updated the security guide on the updated mass-assignment security scopes ↵ | Josh Kalderimis | 2011-04-24 | 1 | -1/+26 |
| | |_|/ | |/| | | | | | | | | | | addition, and assign_attributes in AR | ||||
* / | | | Stop adding actual dummy tests (they clutter up the real ones in a new app), ↵ | David Heinemeier Hansson | 2011-04-23 | 7 | -28/+21 |
|/ / / | | | | | | | | | | just show how its done | ||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-23 | 5 | -20/+35 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | | | copy-edits 2f0dca5 | Xavier Noria | 2011-04-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Grammer fix on note about wildcard routes | Ronnie Miller | 2011-04-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix block alignment | Vijay Dev | 2011-04-23 | 1 | -2/+3 |
| | | | |