Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets | José Valim | 2011-05-05 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Display custom asset routes in `rake routes` | |||||
| * | | | | | | | Display custom asset routes in `rake routes` | Peter Suschlik | 2011-05-05 | 2 | -1/+10 | |
| | | | | | | | | ||||||
* | | | | | | | | add tests for performance test | Jan Xie | 2011-05-05 | 1 | -0/+25 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #390 from arunagw/jruby_openssl | José Valim | 2011-05-05 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adding jruby-openssl in Gemfile by default. #jruby | |||||
| * | | | | | | | Adding jruby-openssl in Gemfile by default. #jruby | Arun Agrawal | 2011-05-05 | 2 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #391 from bradleypriest/patch-1 | José Valim | 2011-05-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Tidying up the language in wrap_parameters.rb | |||||
| * | | | | | | | Tidying up the language in wrap_parameters.rb | Bradley Priest | 2011-05-04 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | No longer need to reference mysql2 from git | David Heinemeier Hansson | 2011-05-04 | 1 | -9/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Dont show the assets mount in rake routes | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+2 | |
| | | | | | | | ||||||
* | | | | | | | Bump up rack-cache, tzinfo and thor | Santiago Pastorino | 2011-05-04 | 1 | -1/+1 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 2 | -35/+35 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | commented meta code | Vijay Dev | 2011-05-04 | 1 | -11/+11 | |
| | | | | | | | ||||||
| * | | | | | | formatting results in comments | Vijay Dev | 2011-05-04 | 2 | -24/+24 | |
| | | | | | | | ||||||
* | | | | | | | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵ | José Valim | 2011-05-04 | 4 | -12/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | like Datamapper can also have their own sandboxing in rails console. | |||||
* | | | | | | | Remove defined?(ActiveRecord) and use the railtie hook instead. | José Valim | 2011-05-04 | 1 | -4/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 4 | -54/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix typo in Factory Girl description | backspace | 2011-05-03 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | removed reference to verify method | Vijay Dev | 2011-05-02 | 1 | -9/+1 | |
| | | | | | | | ||||||
| * | | | | | | removed verify docs (feature removed in Rails3) | Vijay Dev | 2011-05-02 | 1 | -39/+0 | |
| | | | | | | | ||||||
| * | | | | | | Update security guide with #new and #create respect mass-assignment | Sebastian Martinez | 2011-05-02 | 1 | -2/+14 | |
| | | | | | | | ||||||
| * | | | | | | Bring this back on the contributing guide. | Sebastian Martinez | 2011-05-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | remove info about adding verified tag | Vijay Dev | 2011-05-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | fix GitHub guides url | Vijay Dev | 2011-05-01 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | fixes typo in railties/CHANGELOG (spotted by Vijay Dev) | Xavier Noria | 2011-05-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fixed tests for new_plugin_generator. | Arun Agrawal | 2011-05-04 | 1 | -2/+0 | |
| | | | | | | | ||||||
* | | | | | | | restores the -j option, but now it accepts the name of any library | Xavier Noria | 2011-05-04 | 9 | -33/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If passed "foo", a gem "foo-rails" is added to the Gemfile and "foo" and "foo_ujs" are required in the application JavaScript manifest. | |||||
* | | | | | | | removes the :update_ujs task in railties | Xavier Noria | 2011-05-04 | 1 | -4/+0 | |
| | | | | | | | ||||||
* | | | | | | | jQuery is no longer vendored | Xavier Noria | 2011-05-04 | 3 | -8465/+2 | |
| | | | | | | | ||||||
* | | | | | | | Add static_cache_control as configuration option and set a default for test. ↵ | José Valim | 2011-05-03 | 3 | -3/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should improve performance in acceptance tests. | |||||
* | | | | | | | We no longer depend on those git repos. | José Valim | 2011-05-03 | 1 | -6/+0 | |
| | | | | | | | ||||||
* | | | | | | | Use require_self from latest Sprockets | David Heinemeier Hansson | 2011-05-02 | 1 | -0/+1 | |
| | | | | | | | ||||||
* | | | | | | | Allow ignore_accept_header through configuration option. | José Valim | 2011-05-02 | 1 | -0/+21 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #359 from sikachu/params_wrapper. | David Heinemeier Hansson | 2011-05-02 | 2 | -0/+22 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add `ActionController::ParamsWrapper` to wrap JSON parameters into a nested parameters. | |||||
| * | | | | | | | Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash | Prem Sichanugrist | 2011-05-03 | 2 | -0/+22 | |
| |/ / / / / / | | | | | | | | | | | | | | | This will allow us to do a rootless JSON/XML request to server. | |||||
* / / / / / / | Use sprockets beta gem | Joshua Peek | 2011-05-01 | 1 | -7/+4 | |
|/ / / / / / | ||||||
* | | | | | | 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 | |
| | | | | | | | |