Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | 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 dont... | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1564 from sikachu/master-changelog | Aaron Patterson | 2011-06-08 | 1 | -0/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | Paul Gallagher | 2011-06-08 | 2 | -1/+8 | |
* | | | | | | | | | | Merge pull request #1559 from neerajdotname/before_filter_test | José Valim | 2011-06-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Make test meaningful | Neeraj Singh | 2011-06-08 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1556 from thoefer/master | José Valim | 2011-06-08 | 3 | -5/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 3 | -5/+17 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1550 from rsim/fix_test_has_many_with_pluralize_table_nam... | Xavier Noria | 2011-06-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Do not hardcode :id as it was ignored by mass assignment filter | Raimonds Simanovskis | 2011-06-08 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 | Neeraj Singh | 2011-06-08 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #1548 from neerajdotname/remove_class_me5 | José Valim | 2011-06-08 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 failing test on uninitialized `Rails.config.assets.prefix` | Prem Sichanugrist | 2011-06-08 | 1 | -0/+1 | |
| * | | | | | | | | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -2/+2 | |
| * | | | | | | | | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform clon... | Prem Sichanugrist | 2011-06-08 | 1 | -3/+7 | |
* | | | | | | | | | 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. | 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. | 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 | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Ensure that the strings returned by SafeBuffer#gsub and friends aren't consid... | Michael Koziarski | 2011-06-07 | 2 | -0/+25 | |
* | | | | | | | | Allow polymorphic has_one to work when the association is set before the owne... | Jon Leighton | 2011-06-08 | 2 | -3/+12 | |
* | | | | | | | | When you add a record to a polymorphic has_one, you should be able to access ... | Jon Leighton | 2011-06-08 | 3 | -3/+6 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | 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 | Alexandr Zykov | 2011-06-08 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* / / / / / / | Update asset helpers to use `config.assets.prefix` | Joshua Peek | 2011-06-07 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | 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 | |
* | | | | | | Do not use default_scope in ActiveRecord::Persistence#touch. | Dmitriy Kiriyenko | 2011-06-07 | 2 | -1/+10 | |
* | | | | | | Merge pull request #1516 from guilleiguaran/rack-urlmap-fix | José Valim | 2011-06-07 | 2 | -1/+5 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fixing Rails::Server#app under Rack::URLMap | Guillermo Iguaran | 2011-06-07 | 2 | -1/+5 | |
|/ / / / / | ||||||
* | | | | | adds missing require | Xavier Noria | 2011-06-07 | 1 | -0/+2 | |
* | | | | | Fix a couple of helper requires that were missed. This was causing the tests ... | Jon Leighton | 2011-06-07 | 2 | -2/+2 | |
* | | | | | Merge pull request #1474 from ganeshkumar/update_column_changes | José Valim | 2011-06-07 | 1 | -0/+9 | |
|\ \ \ \ \ |