aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| * | | | | | | | | Update CHANGELOG to mention the new SafeBuffer changePrem Sichanugrist2011-06-081-0/+29
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1560 from sikachu/master-escapejsJosé Valim2011-06-082-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make escape_javascript happy to handle SafeBuffers
| * | | | | | | | | Make escape_javascript happy to handle SafeBuffersPaul Gallagher2011-06-082-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
* | | | | | | | | | Merge pull request #1559 from neerajdotname/before_filter_testJosé Valim2011-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Make test meaningful
| * | | | | | | | | Make test meaningfulNeeraj Singh2011-06-081-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If before_filter list was being called mistakenly then the test should fail. However test will not fail because second filter is assigning new values to @list. To truly test that first before_filter is not called when it should not be called then @list should not assigned value unconditionally. This patch will make the test fail if first filter is called.
* | | | | | | | | Merge pull request #1556 from thoefer/masterJosé Valim2011-06-083-5/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Brought back alternative convention for namespaced models in i18n
| * | | | | | | | | Brought back alternative convention for namespaced models in i18n.thoefer2011-06-083-5/+17
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1550 from ↵Xavier Noria2011-06-081-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | rsim/fix_test_has_many_with_pluralize_table_names_false Do not hardcode :id as it was ignored by mass assignment filter
| * | | | | | | | Do not hardcode :id as it was ignored by mass assignment filterRaimonds Simanovskis2011-06-081-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | As a result test was failing on Oracle where ids are assigned by default from 1000
* | | | | | | | Merge pull request #1549 from neerajdotname/rename_to_method_for_actionJosé Valim2011-06-081-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | test name should reflect the name of the method
| * | | | | | | | test name should reflect the name of the methodNeeraj Singh2011-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that is actually being called
* | | | | | | | | Merge pull request #1548 from neerajdotname/remove_class_me5José Valim2011-06-081-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove unused class from test
| * | | | | | | | | remove unused class from testNeeraj Singh2011-06-081-6/+0
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1547 from sikachu/safebufferJosé Valim2011-06-073-5/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix ActionPack tests on `master`
| * | | | | | | | Fix failing test on uninitialized `Rails.config.assets.prefix`Prem Sichanugrist2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb:
| * | | | | | | | Add proper fix to `mail_to` helper.Prem Sichanugrist2011-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
| * | | | | | | | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵Prem Sichanugrist2011-06-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.
* | | | | | | | | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebufferJosé Valim2011-06-071-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't operate on the safebuffer, operate on a string and convert.
| * | | | | | | | | Don't operate on the safebuffer, operate on a string and convert.Christopher Meiklejohn2011-06-071-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1535 from smartinez87/eachJosé Valim2011-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Prefer 'each' over 'for in' syntax.
| * | | | | | | | | Prefer 'each' over 'for in' syntax.Sebastian Martinez2011-06-071-1/+1
| |/ / / / / / / /
* | | | | | | | | remove warning: assigned but unused variableSantiago Pastorino2011-06-0820-26/+16
| | | | | | | | |
* | | | | | | | | ruby-prof doesn't work in 1.9.3Santiago Pastorino2011-06-081-1/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_cachingAaron Patterson2011-06-071-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fragment caching needs to operate on the pure output, not the safebuffer.
| * | | | | | | | Fragment caching needs to operate on the pure output, not theChristopher Meiklejohn2011-06-071-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | safebuffer.
* | | | | | | | Ensure that the strings returned by SafeBuffer#gsub and friends aren't ↵Michael Koziarski2011-06-072-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | considered html_safe? Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all. Conflicts: activesupport/test/safe_buffer_test.rb
* | | | | | | | Allow polymorphic has_one to work when the association is set before the ↵Jon Leighton2011-06-082-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owner has been saved. Fixes #1524.
* | | | | | | | When you add a record to a polymorphic has_one, you should be able to access ↵Jon Leighton2011-06-083-3/+6
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | the owner from the associated record
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-083-64/+80
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-24 21:44:31 +0000