aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-049-9/+9
|
* Only show dump of regular env methods on exception screen (not all the rack ↵David Heinemeier Hansson2011-05-043-5/+8
| | | | crap) [DHH]
* Dont show the assets mount in rake routesDavid Heinemeier Hansson2011-05-041-1/+2
|
* ensure query cache is cleared when Rack body is closed, fixes bug reported ↵Aaron Patterson2011-05-042-0/+12
| | | | on 951e18abea9c116fc5d6b330ca1dcd2890abe006
* Bump up rack-cache, tzinfo and thorSantiago Pastorino2011-05-043-4/+4
|
* Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-042-3/+4
|\
| * Merge pull request #387 from smartinez87/remove_method.José Valim2011-05-042-3/+4
| |\ | | | | | | Use #remove_possible_method instead
| | * Use #remove_possible_method instead hereSebastian Martinez2011-05-041-2/+3
| | |
| | * Use #remove_possible_method insteadSebastian Martinez2011-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
| | |
* | | Fix renew feature on cookies.José Valim2011-05-042-1/+17
| | |
* | | Fix .subdomain regression.José Valim2011-05-042-1/+10
| |/ |/|
* | Use remove possible method here.José Valim2011-05-041-1/+2
| |
* | Relax this dependency a bit.José Valim2011-05-041-1/+1
| |
* | Let's run those precious tests against the gem.José Valim2011-05-041-2/+0
| |
* | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵José Valim2011-05-045-7/+21
| | | | | | | | like Datamapper can also have their own sandboxing in rails console.
* | Remove defined?(ActiveRecord) and use the railtie hook instead.José Valim2011-05-042-7/+4
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-0412-97/+82
|\
| * Remove extra whitespacesSebastian Martinez2011-05-031-9/+9
| |
| * Improves Mysql2 adapter docsSebastian Martinez2011-05-031-0/+6
| |
| * Added #recreate_database docsSebastian Martinez2011-05-031-0/+2
| |
| * Fixes on schema_definitions docsSebastian Martinez2011-05-031-3/+3
| |
| * Fix typo in Factory Girl descriptionbackspace2011-05-031-1/+1
| |
| * fixed-fonts on SchemaDefinitionsSebastian Martinez2011-05-021-3/+3
| |
| * Remove extra whitespacesSebastian Martinez2011-05-021-18/+18
| |
| * 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
| |
| * Added some docs on ActiveResource::HttpMockSebastian Martinez2011-05-011-0/+4
| |
| * Documented ActiveResource#observingSebastian Martinez2011-05-011-0/+8
| |
| * Remove extra whitespaces.Sebastian Martinez2011-05-011-5/+5
| |
| * Fix punctuation errors.Sebastian Martinez2011-05-011-5/+5
| |
| * 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
| |
* | More AV::Base cleanup.José Valim2011-05-044-43/+55
| |
* | Merge pull request #384 from arunagw/new_plugin_test.Xavier Noria2011-05-041-2/+0
|\ \ | | | | | | Fixed tests for new_plugin_generator.
| * | Fixed tests for new_plugin_generator.Arun Agrawal2011-05-041-2/+0
| | |
* | | Move prefixes to view paths as they are now a lookup context dependency.José Valim2011-05-045-23/+30
|/ /
* | restores the -j option, but now it accepts the name of any libraryXavier Noria2011-05-0410-34/+46
| | | | | | | | | | | | 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
| |