aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #1625 from neerajdotname/page_cachingJosé Valim2011-06-102-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Three minor fixes to tests
| * | | | | | 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
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_should_cache_with_trailing_slash_on_url A trailing slash is removed when a page is cached. What the test meant to say was : a url with trailing slash should be cached and the cached page should not have any trailing slash. This patch clarifies the name a bit.
* | | | | | ensuring that json_escape returns html safe strings when passed an html safe ↵Aaron Patterson2011-06-092-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | string
* | | | | | 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 ↵Jon Leighton2011-06-093-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | running unit tests
* | | | | | 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 argumen
| * | | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵Prem Sichanugrist2011-06-093-1/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | is already html_safe
* | | | | | Merge pull request #1606 from neerajdotname/remove_users_controller_from_testJosé Valim2011-06-091-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused UserController from test
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix engine's generator
| * | | | | | 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 ↵Ryan Bigg2011-06-071-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | namespaced
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix "warning: assigned but unused variable" on AR tests
| * | | | | | | 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 ↵José Valim2011-06-081-12/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/remove_unused_class_with_symbol_returning class WithSymbolReturningString is not used anywhere in the test.
| * | | | | | | class WithSymbolReturningString is not used anywhere in the test.Neeraj Singh2011-06-081-12/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secondly it seemed from the method that the intent was to test a case where layout was declared in a symbol and the method named mention in layout returns nil. That case is already covered with class class WithSymbolReturningNil . Also the case of SymbolReturningString is covered with the class WithSymbol.
* | | | | | | Merge pull request #1579 from bradleybuda/masterJosé Valim2011-06-082-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Date#freeze fails when called more than once in 1.8
| * | | | | | | Allow a Date to be frozen more than once without an error in Ruby 1.8.xBradley Buda2011-06-082-4/+12
| | | | | | | |
* | | | | | | | Merge pull request #1577 from reu/useless-variable-setJosé Valim2011-06-081-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Instance variable not used.
| * | | | | | | | No need to create a new Arel::Table, as the arel_table method already ↵Rodrigo Navarro2011-06-081-1/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | creates a new one
* | | | | | | | Merge pull request #1593 from r00k/masterAaron Patterson2011-06-081-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Simplify boolean logic into ternary
| * | | | | | | Simplify boolean logic into ternary.Ben Orenstein2011-06-081-1/+1
|/ / / / / / /
* | | | | | | Indention style + whitespace for readabilityDavid Heinemeier Hansson2011-06-091-33/+38
| | | | | | |
* | | | | | | If you set a js_compressor, it means that you want shit compressed -- we ↵David Heinemeier Hansson2011-06-091-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | dont need a second option to turn that on
* | | | | | Merge pull request #1564 from sikachu/master-changelogAaron Patterson2011-06-081-0/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update CHANGELOG to mention the new SafeBuffer change