| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | class WithSymbolReturningString is not used anywhere in the test. | Neeraj Singh | 2011-06-08 | 1 | -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/master | José Valim | 2011-06-08 | 2 | -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.x | Bradley Buda | 2011-06-08 | 2 | -4/+12 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1577 from reu/useless-variable-set | José Valim | 2011-06-08 | 1 | -1/+0 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Instance variable not used. | |||||
| | * | | | | | No need to create a new Arel::Table, as the arel_table method already ↵ | Rodrigo Navarro | 2011-06-08 | 1 | -1/+0 | |
| | |/ / / / | | | | | | | | | | | | | | | | creates a new one | |||||
| * | | | | | Merge pull request #1593 from r00k/master | Aaron Patterson | 2011-06-08 | 1 | -1/+1 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Simplify boolean logic into ternary | |||||
| | * | | | | Simplify boolean logic into ternary. | Ben Orenstein | 2011-06-08 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Indention style + whitespace for readability | David Heinemeier Hansson | 2011-06-09 | 1 | -33/+38 | |
| | | | | | ||||||
| * | | | | If you set a js_compressor, it means that you want shit compressed -- we ↵ | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 | |
| |/ / / | | | | | | | | | | dont need a second option to turn that on | |||||
| * | | | Merge pull request #1564 from sikachu/master-changelog | Aaron Patterson | 2011-06-08 | 1 | -0/+29 | |
| |\ \ \ | | | | | | | | | Update CHANGELOG to mention the new SafeBuffer change | |||||
| | * | | | Update CHANGELOG to mention the new SafeBuffer change | Prem Sichanugrist | 2011-06-08 | 1 | -0/+29 | |
| |/ / / | ||||||
| * | | | Merge pull request #1560 from sikachu/master-escapejs | José Valim | 2011-06-08 | 2 | -1/+8 | |
| |\ \ \ | | | | | | | | | Make escape_javascript happy to handle SafeBuffers | |||||
| | * | | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 2 | -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_test | José Valim | 2011-06-08 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / |/| | | | Make test meaningful | |||||
| | * | | | Make test meaningful | Neeraj Singh | 2011-06-08 | 1 | -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/master | José Valim | 2011-06-08 | 3 | -5/+17 | |
| |\ \ \ | | | | | | | | | Brought back alternative convention for namespaced models in i18n | |||||
| | * | | | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 3 | -5/+17 | |
| |/ / / | ||||||
| * | | | Merge pull request #1550 from ↵ | Xavier Noria | 2011-06-08 | 1 | -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 filter | Raimonds Simanovskis | 2011-06-08 | 1 | -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_action | José Valim | 2011-06-08 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | test name should reflect the name of the method | |||||
| | * | | | test name should reflect the name of the method | Neeraj Singh | 2011-06-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | that is actually being called | |||||
| * | | | | Merge pull request #1548 from neerajdotname/remove_class_me5 | José Valim | 2011-06-08 | 1 | -6/+0 | |
| |\ \ \ \ | | | | | | | | | | | remove unused class from test | |||||
| | * | | | | remove unused class from test | Neeraj Singh | 2011-06-08 | 1 | -6/+0 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #1547 from sikachu/safebuffer | José Valim | 2011-06-07 | 3 | -5/+10 | |
| |\ \ \ \ | |/ / / |/| | | | Fix ActionPack tests on `master` | |||||
| | * | | | Fix failing test on uninitialized `Rails.config.assets.prefix` | Prem Sichanugrist | 2011-06-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb: | |||||
| | * | | | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -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 Sichanugrist | 2011-06-08 | 1 | -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_safebuffer | José Valim | 2011-06-07 | 1 | -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 Meiklejohn | 2011-06-07 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1535 from smartinez87/each | José Valim | 2011-06-07 | 1 | -1/+1 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Prefer 'each' over 'for in' syntax. | |||||
| | * | | | | Prefer 'each' over 'for in' syntax. | Sebastian Martinez | 2011-06-07 | 1 | -1/+1 | |
| | |/ / / | ||||||
| * | | | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 20 | -26/+16 | |
| | | | | | ||||||
| * | | | | ruby-prof doesn't work in 1.9.3 | Santiago Pastorino | 2011-06-08 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_caching | Aaron Patterson | 2011-06-07 | 1 | -1/+3 | |
| |\ \ \ \ | |/ / / |/| | | | Fragment caching needs to operate on the pure output, not the safebuffer. | |||||
| | * | | | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 | |
| |/ / / | | | | | | | | | | safebuffer. | |||||
| * | | | Ensure that the strings returned by SafeBuffer#gsub and friends aren't ↵ | Michael Koziarski | 2011-06-07 | 2 | -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 Leighton | 2011-06-08 | 2 | -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 Leighton | 2011-06-08 | 3 | -3/+6 | |
| | | | | | | | | | | | | | the owner from the associated record | |||||
| * | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-08 | 3 | -64/+80 | |
| |\ \ \ | ||||||
| | * | | | fix spacing | Vijay Dev | 2011-06-08 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add action_mailer observer and interceptors configuration options | Paco Guzman | 2011-06-07 | 2 | -5/+15 | |
| | | | | | ||||||
| | * | | | add missing generator configs | Vijay Dev | 2011-06-08 | 1 | -3/+7 | |
| | | | | | ||||||
| | * | | | proof reading and fixes in configuring guide | Vijay Dev | 2011-06-08 | 1 | -55/+57 | |
| | | | | | ||||||
| | * | | | fix indents and a code error in caching guide | Vijay Dev | 2011-06-08 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Merge pull request #1533 from alexandrz/master | Xavier Noria | 2011-06-07 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Fix typo | |||||
| | * | | | | fix typo | Alexandr Zykov | 2011-06-08 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * / / / | Update asset helpers to use `config.assets.prefix` | Joshua Peek | 2011-06-07 | 1 | -2/+2 | |
| |/ / / | | | | | | | Fixes #1489 | |||||
| * | | | mention assets:clean in railties CHANGELOG | Xavier Noria | 2011-06-07 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | sprockets gzips assets now | Xavier Noria | 2011-06-07 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | This way asserting that updated_at was changed in touch look more obvious. | Dmitriy Kiriyenko | 2011-06-07 | 1 | -0/+1 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |