aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve PostgreSQL adapter schema-awarenessPaul Gallagher2011-06-103-27/+173
* Merge pull request #1631 from vijaydev/runner-helpJosé Valim2011-06-102-0/+8
|\
| * make 'rails runner' show usage when run without any optionsVijay Dev2011-06-102-0/+8
|/
* Merge pull request #1567 from BDQ/engine_migrationsJosé Valim2011-06-102-5/+12
|\
| * Updated test to ensure correct sequence when copying engine/plugin migrations.Brian Quinn2011-06-101-4/+11
| * Ensure engine migrations are copied in the same sequence that they are required.Brian Quinn2011-06-101-1/+1
|/
* Ensure number helpers can handle HTML safe strings - closes #1597.Andrew White2011-06-102-1/+8
* Merge pull request #1523 from raghunadhd/refactor_regexXavier Noria2011-06-101-4/+7
|\
| * removed the unnecessary back slashes from the regular expressionRaghunadh2011-06-101-2/+2
| * rafactored the regex related code in the mapper class Raghunadh2011-06-071-4/+7
* | Merge pull request #1625 from neerajdotname/page_cachingJosé Valim2011-06-102-2/+3
|\ \
| * | add missing ensureNeeraj Singh2011-06-101-0/+1
| * | replaced and with && as per coding guidelinesNeeraj Singh2011-06-101-1/+1
| * | The test name is misleading. It saysNeeraj Singh2011-06-101-1/+1
|/ /
* | ensuring that json_escape returns html safe strings when passed an html safe ...Aaron Patterson2011-06-092-1/+12
* | don't reinitialize the arel_table unless the table_name changesDamien Mathieu2011-06-091-1/+2
* | Fix issue #1598 by adding a dependency to the RDoc gem.Jacob Poulsgaard Tjoernholm2011-06-091-0/+1
* | Print out information about whether the identity map is on or off when runnin...Jon Leighton2011-06-093-6/+14
* | Update the RUNNING_UNIT_TESTS fileJon Leighton2011-06-091-10/+5
* | Merge pull request #1609 from sikachu/master-javascriptAaron Patterson2011-06-093-1/+6
|\ \
| * | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is...Prem Sichanugrist2011-06-093-1/+6
|/ /
* | Merge pull request #1606 from neerajdotname/remove_users_controller_from_testJosé Valim2011-06-091-3/+0
|\ \
| * | remove unused user_controller from testNeeraj Singh2011-06-081-3/+0
* | | Merge pull request #1356 from flippingbits/fix_engine_generatorJosé Valim2011-06-0918-50/+209
|\ \ \
| * | | Prepend bundle exec to get the correct Rake versionStefan Sprenger2011-06-071-3/+3
| * | | Use RAILS_ISOLATED_ENGINE and fix namespaced generators testsStefan Sprenger2011-06-074-12/+3
| * | | Use mattr_accessor :namespaceStefan Sprenger2011-06-072-13/+2
| * | | Don't create full Rails application if RAILS_ISOLATION_COMMAND equals engineStefan Sprenger2011-06-071-1/+1
| * | | Use namespace if it's a mountable engineStefan Sprenger2011-06-075-12/+61
| * | | Added regression testsStefan Sprenger2011-06-071-12/+5
| * | | Move test/engine/generators_test.rb to test/railties/generators_test.rbStefan Sprenger2011-06-071-1/+1
| * | | Add test for helper generatorStefan Sprenger2011-06-071-3/+10
| * | | Clean up engine's generator test and use bundle exec for invoking generatorsStefan Sprenger2011-06-071-13/+30
| * | | Clean up engine generators_test code and add test for models correctly namesp...Ryan Bigg2011-06-071-7/+19
| * | | Add beginnings of test for generators within the context of an engineRyan Bigg2011-06-071-0/+54
| * | | We moved engine commands to rails/engine/commandsStefan Sprenger2011-05-271-5/+1
| * | | Add destroy to engine's commandsStefan Sprenger2011-05-271-2/+3
| * | | Generate script/rails only if --full is givenStefan Sprenger2011-05-273-5/+7
| * | | Refactor identifying generator's destination rootStefan Sprenger2011-05-271-5/+2
| * | | Fix appending 'Stefan Sprenger2011-05-271-1/+1
| * | | We're using module not class for namespacingStefan Sprenger2011-05-271-8/+8
| * | | Move requiring engine out of the switch caseStefan Sprenger2011-05-271-4/+3
| * | | Fix and test ENGINE_PATH and ENGINE_ROOTStefan Sprenger2011-05-272-2/+10
| * | | Introducing engine commandsStefan Sprenger2011-05-263-3/+48
| * | | Move load_generators from Rails::Application to Rails::EngineStefan Sprenger2011-05-262-12/+12
| * | | We're now using generators directlyStefan Sprenger2011-05-261-1/+0
* | | | Merge pull request #1591 from smartinez87/unusedJosé Valim2011-06-082-3/+3
|\ \ \ \
| * | | | Remove unused 'y' variable.Sebastian Martinez2011-06-081-2/+2
| * | | | Remove unused 'quoted_column_names' variable.Sebastian Martinez2011-06-081-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1588 from neerajdotname/remove_unused_class_with_symbol_r...José Valim2011-06-081-12/+0
|\ \ \ \