aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Changing examples: use 'each' instead of 'for in'Guillermo Iguaran2011-05-191-4/+4
| | |
| * | fixes code highlight in shallow_path exampleDiego Plentz2011-05-191-4/+4
| | |
| * | Remove extra white-spaces.Sebastian Martinez2011-05-191-24/+24
| | |
| * | Closes GH #1032John Paul Ashenfelter2011-05-191-1/+1
| | | | | | | | | | | | Fixed what looks like minor cut/paste error in documentation for ActiveRecord::Locking:Pessimistic
* | | Merge pull request #1305 from amatsuda/require_rdoc_task_fail2José Valim2011-05-255-17/+7
|\ \ \ | | | | | | | | Ensure RDoc::Task exists even if 'rdoc/task' was not required
| * | | Ensure RDoc::Task exists even if 'rdoc/task' was not requiredAkira Matsuda2011-05-265-17/+7
| | | |
* | | | Merge pull request #1308 from vijaydev/fix-codestat-indentJosé Valim2011-05-251-1/+1
|\ \ \ \ | | | | | | | | | | Minor indentation fix in code_statistics
| * | | | fix indentationVijay Dev2011-05-251-1/+1
| |/ / /
* / / / Renaming helper in the Rake task, but why is this needed in the first place? ↵wycats2011-05-251-1/+1
|/ / / | | | | | | | | | (paging JP)
* | | Merge pull request #1301 from amatsuda/require_rdoc_task_failXavier Noria2011-05-255-6/+27
|\ \ \ | | | | | | | | require 'rake/rdoctask' if failed to require 'rdoc/task'
| * | | require 'rake/rdoctask' if failed to require 'rdoc/task'Akira Matsuda2011-05-265-6/+27
| | | | | | | | | | | | | | | | | | | | fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5 require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
* | | | Merge pull request #1299 from cesario/mit-licenseJosé Valim2011-05-253-3/+3
|\ \ \ \ | | | | | | | | | | Ensure MIT-LICENSE is included in all the gemspec's
| * | | | Add the MIT-LICENSE to the Active Support gemspecFranck Verrot2011-05-251-1/+1
| | | | |
| * | | | Add the MIT-LICENSE to the Active Resource gemspecFranck Verrot2011-05-251-1/+1
| | | | |
| * | | | Add the MIT-LICENSE to the Active Record gemspecFranck Verrot2011-05-251-1/+1
|/ / / /
* | | | Merge pull request #1298 from flippingbits/add_test_files_to_gemspecJosé Valim2011-05-252-1/+13
|\ \ \ \ | |/ / / |/| | | Add test files to engine's gemspec
| * | | Improve test assertionStefan Sprenger2011-05-251-1/+3
| | | |
| * | | Remove whitespaces from empty lineStefan Sprenger2011-05-251-1/+1
| | | |
| * | | Add test files to engine's gemspecStefan Sprenger2011-05-252-0/+10
|/ / /
* | | Merge pull request #1260 from flippingbits/masterJosé Valim2011-05-252-1/+5
|\ \ \ | | | | | | | | Remove shebang from the template
| * | | Add test for shebang in engine's script/rails fileStefan Sprenger2011-05-241-0/+5
| | | |
| * | | Merge branch 'master' of https://github.com/rails/railsStefan Sprenger2011-05-241-1/+2
| |\ \ \
| * | | | Remove shebang from the template since it's already added by theStefan Sprenger2011-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | generator
* | | | | Merge pull request #1297 from cesario/1294-allocated-object-cant-be-inspectedJosé Valim2011-05-252-6/+18
|\ \ \ \ \ | | | | | | | | | | | | #1294 : allocated object cant be inspected [closes #1294]
| * | | | | Fix the AR::Base#inspect method [closes #1294]Franck Verrot2011-05-251-6/+10
| | | | | |
| * | | | | Test AR::Base#inspect on an allocated object not yet initializedFranck Verrot2011-05-251-0/+8
|/ / / / /
* | | | | Merge pull request #1293 from janx/masterJosé Valim2011-05-251-4/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix Rails::Paths::Root documentation
| * | | | | fix Rails::Paths::Root documentJan Xie2011-05-251-4/+3
| | | | | |
* | | | | | Merge pull request #1292 from arunagw/database_generatorsJosé Valim2011-05-251-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Database.rake file fixed for load_generators
| * | | | | Database.rake file fixed for load_generatorsArun Agrawal2011-05-251-2/+1
|/ / / / /
* | | | | Merge pull request #1290 from arunagw/load_generators_useJosé Valim2011-05-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Using load_generators
| * | | | | Using load_generatorsArun Agrawal2011-05-251-1/+1
|/ / / / /
* | | | | Use load_generators instead.José Valim2011-05-251-4/+2
| | | | |
* | | | | Merge pull request #1288 from guilleiguaran/railties-deprecationsJosé Valim2011-05-2515-287/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove Railties deprecated methods
| * | | | | Removing deprecated config.generators in Rails::RailtieGuillermo Iguaran2011-05-251-5/+0
| | | | | |
| * | | | | Remove deprecated plugin generatorGuillermo Iguaran2011-05-2411-202/+0
| | | | | |
| * | | | | Removing Deprecated Path API testsGuillermo Iguaran2011-05-241-53/+0
| | | | | |
| * | | | | Removing deprecated config.paths.app.controller APIGuillermo Iguaran2011-05-242-27/+1
| | | | | |
* | | | | | Merge pull request #1287 from ↵José Valim2011-05-251-7/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | guilleiguaran/removing-test_load_generators_from_railties load_generators_from_railties was removed, remove test with error about it
| * | | | | load_generators_from_railties was removed, remove failing ↵Guillermo Iguaran2011-05-241-7/+0
| | |_|_|/ | |/| | | | | | | | | | | | | test_load_generators_from_railties
* | | | | Merge pull request #1286 from arunagw/fixed_failing_generators_testAaron Patterson2011-05-242-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Fixed failing tests for generators_test
| * | | | fixed test_deliver_is_notified need base_mailerArun Agrawal2011-05-251-0/+1
| | | | |
| * | | | Fixed failing tests for generators_testArun Agrawal2011-05-251-2/+2
|/ / / /
* | | | Everyone receives app as argument for consistency.José Valim2011-05-256-18/+22
| | | |
* | | | Actually this file may be invoked directly as well with --dev.José Valim2011-05-252-1/+3
| | | |
* | | | Streamline generators initialization flow.José Valim2011-05-257-23/+11
| | | |
* | | | Update default Gemfile to point to sass-rails, not sasswycats2011-05-241-1/+1
| | | |
* | | | Fix infinite recursion where a lazy default scope references a scope. Fixes ↵Jon Leighton2011-05-254-4/+36
| | | | | | | | | | | | | | | | #1264.
* | | | Hide css:* and the default stylesheet from rails gwycats2011-05-241-1/+6
| | | |
* | | | Update generator config to support hiding namespaces and pass the app into ↵wycats2011-05-244-4/+12
| | | | | | | | | | | | | | | | generator blocks