aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* be consistentAditya Sanghi2011-05-061-3/+1
|
* review fixesAditya Sanghi2011-05-063-6/+11
|
* default orm and test_framework to false; change application.rb template ↵Aditya Sanghi2011-05-063-12/+12
| | | | accordingly
* When skipping skip active record, mark config.generators.orm to false; LH ↵Aditya Sanghi2011-05-062-1/+6
| | | | 5796 remainder
* Take into account the Rack::Server :SSLEnable option when building the ↵Daniel Martin2011-05-061-1/+2
| | | | application's URL
* Ensure params wrapper settings are not inherited and calculated each time.José Valim2011-05-061-3/+27
|
* Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assetsJosé Valim2011-05-052-1/+10
|\ | | | | Display custom asset routes in `rake routes`
| * Display custom asset routes in `rake routes`Peter Suschlik2011-05-052-1/+10
| |
* | add tests for performance testJan Xie2011-05-051-0/+25
|/
* Merge pull request #390 from arunagw/jruby_opensslJosé Valim2011-05-052-0/+2
|\ | | | | Adding jruby-openssl in Gemfile by default. #jruby
| * Adding jruby-openssl in Gemfile by default. #jrubyArun Agrawal2011-05-052-0/+2
| |
* | Merge pull request #391 from bradleypriest/patch-1José Valim2011-05-051-1/+1
|\ \ | |/ |/| Tidying up the language in wrap_parameters.rb
| * Tidying up the language in wrap_parameters.rbBradley Priest2011-05-041-1/+1
| |
* | No longer need to reference mysql2 from gitDavid Heinemeier Hansson2011-05-041-9/+1
|/
* Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
|
* Dont show the assets mount in rake routesDavid Heinemeier Hansson2011-05-041-1/+2
|
* Bump up rack-cache, tzinfo and thorSantiago Pastorino2011-05-041-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-042-35/+35
|\
| * commented meta codeVijay Dev2011-05-041-11/+11
| |
| * formatting results in commentsVijay Dev2011-05-042-24/+24
| |
* | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵José Valim2011-05-044-12/+19
| | | | | | | | like Datamapper can also have their own sandboxing in rails console.
* | Remove defined?(ActiveRecord) and use the railtie hook instead.José Valim2011-05-041-4/+0
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-044-54/+19
|\
| * Fix typo in Factory Girl descriptionbackspace2011-05-031-1/+1
| |
| * removed reference to verify methodVijay Dev2011-05-021-9/+1
| |
| * removed verify docs (feature removed in Rails3)Vijay Dev2011-05-021-39/+0
| |
| * Update security guide with #new and #create respect mass-assignmentSebastian Martinez2011-05-021-2/+14
| |
| * Bring this back on the contributing guide.Sebastian Martinez2011-05-011-1/+1
| |
| * remove info about adding verified tagVijay Dev2011-05-011-1/+1
| |
| * fix GitHub guides urlVijay Dev2011-05-011-2/+2
| |
* | fixes typo in railties/CHANGELOG (spotted by Vijay Dev)Xavier Noria2011-05-041-1/+1
| |
* | Fixed tests for new_plugin_generator.Arun Agrawal2011-05-041-2/+0
| |
* | restores the -j option, but now it accepts the name of any libraryXavier Noria2011-05-049-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 railtiesXavier Noria2011-05-041-4/+0
| |
* | jQuery is no longer vendoredXavier Noria2011-05-043-8465/+2
| |
* | Add static_cache_control as configuration option and set a default for test. ↵José Valim2011-05-033-3/+8
| | | | | | | | Should improve performance in acceptance tests.
* | We no longer depend on those git repos.José Valim2011-05-031-6/+0
| |
* | Use require_self from latest SprocketsDavid Heinemeier Hansson2011-05-021-0/+1
| |
* | Allow ignore_accept_header through configuration option.José Valim2011-05-021-0/+21
| |
* | Merge pull request #359 from sikachu/params_wrapper.David Heinemeier Hansson2011-05-022-0/+22
|\ \ | | | | | | Add `ActionController::ParamsWrapper` to wrap JSON parameters into a nested parameters.
| * | Add `ActionController::ParamsWrapper` to wrap parameters into a nested hashPrem Sichanugrist2011-05-032-0/+22
| |/ | | | | This will allow us to do a rootless JSON/XML request to server.
* / Use sprockets beta gemJoshua Peek2011-05-011-7/+4
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-019-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 Gehard2011-04-291-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 guideSebastian Martinez2011-04-291-1/+1
| |
| * Upload patches is for LH, we use pull requests on GitHub nowSebastian Martinez2011-04-291-1/+1
| |
| * Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-298-107/+110
| |\
| | * Edited railties/guides/source/routing.textile via GitHubStefan Rohlfing2011-04-281-2/+2
| | |
| | * document the reorder method(fb215110401c70cfc7013c6e2ad5753fa4e374e9)Vijay Dev2011-04-281-4/+31
| | |
| | * update the Array#from behaviour changes - returns [] if index exceeds array ↵Vijay Dev2011-04-271-2/+2
| | | | | | | | | | | | length