aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ensure RDoc::Task exists even if 'rdoc/task' was not requiredAkira Matsuda2011-05-265-17/+7
* Merge pull request #1301 from amatsuda/require_rdoc_task_failXavier Noria2011-05-255-6/+27
|\
| * require 'rake/rdoctask' if failed to require 'rdoc/task'Akira Matsuda2011-05-265-6/+27
* | Merge pull request #1299 from cesario/mit-licenseJosé Valim2011-05-253-3/+3
|\ \
| * | 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
|\ \ | |/ |/|
| * 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
|\
| * 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
* | | Merge pull request #1297 from cesario/1294-allocated-object-cant-be-inspectedJosé Valim2011-05-252-6/+18
|\ \ \
| * | | 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 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_generatorsArun Agrawal2011-05-251-2/+1
|/ / /
* | | Merge pull request #1290 from arunagw/load_generators_useJosé Valim2011-05-251-1/+1
|\ \ \
| * | | 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
|\ \ \
| * | | 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 guilleiguaran/removing-test_load_generators_fro...José Valim2011-05-251-7/+0
|\ \ \ \ | |/ / / |/| | |
| * | | load_generators_from_railties was removed, remove failing test_load_generator...Guillermo Iguaran2011-05-241-7/+0
* | | | Merge pull request #1286 from arunagw/fixed_failing_generators_testAaron Patterson2011-05-242-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | 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 ge...wycats2011-05-244-4/+12
* | | Move SCSS generators and default templates from Rails to the Sass Railtie (d4...tomhuda2011-05-2412-124/+61
* | | Change compressor API so that plugins can register default compressors for th...tomhuda2011-05-243-5/+11
* | | Merge pull request #1283 from joshk/actiom_mailer_tests_fixedJosé Valim2011-05-241-0/+1
|\ \ \
| * | | corrected the ActionMailer tests which broke due to some code removed from Ac...Josh Kalderimis2011-05-251-0/+1
|/ / /
* | | Merge pull request #1281 from joshk/removed_action_pack_deprecationsJosé Valim2011-05-2417-213/+6
|\ \ \
| * | | removed deprecated methods, and related tests, from ActionPackJosh Kalderimis2011-05-2417-213/+6
* | | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scopeJon Leighton2011-05-244-1/+16
|\ \ \ \
| * | | | Ignore :includes on through associationsAndrew White2011-05-244-1/+16