Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix warning: possibly useless use of % in void context | kennyj | 2012-05-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6355 from amutz/fix_number_with_delimiter_escaping | Rafael Mendonça França | 2012-05-18 | 3 | -1/+4 |
|\ | | | | | NumberHelper.number_with_delimiter should html_escape both delimiters and separators | ||||
| * | reverting decoupling of NumberHelper from safe_join and adding tests for ↵ | Andrew Mutz | 2012-05-18 | 3 | -1/+4 |
|/ | | | | escaping of delimiters and separators | ||||
* | port some mocha to minitest/mock | Aaron Patterson | 2012-05-18 | 4 | -222/+223 |
| | |||||
* | Merge pull request #6382 from oscardelben/refactor_migration_generator | José Valim | 2012-05-18 | 1 | -6/+3 |
|\ | | | | | Refactor migration generator | ||||
| * | Refactor migration generator | Oscar Del Ben | 2012-05-18 | 1 | -6/+3 |
| | | |||||
* | | Merge pull request #6380 from nashby/output-safety-interpolation | José Valim | 2012-05-18 | 2 | -3/+8 |
|\ \ | | | | | | | doesn't modify params in SafeBuffer#% | ||||
| * | | doesn't modify params in SafeBuffer#% | Vasiliy Ermolovich | 2012-05-18 | 2 | -3/+8 |
| | | | |||||
* | | | fix typo [ci skip] | Jon Leighton | 2012-05-18 | 1 | -1/+1 |
| | | | |||||
* | | | add changelogs about deprecated stuff [ci skip] | Jon Leighton | 2012-05-18 | 1 | -1/+55 |
|/ / | |||||
* | | quarantine more deprecated stuff | Jon Leighton | 2012-05-18 | 4 | -36/+36 |
| | | |||||
* | | quarantine deprecated tests | Jon Leighton | 2012-05-18 | 10 | -578/+605 |
| | | |||||
* | | Merge pull request #6373 from bogdan/callbacks_fix | José Valim | 2012-05-17 | 1 | -1/+1 |
|\ \ | | | | | | | AS::Callbacks: fix run_callbacks for objects with negative id | ||||
| * | | AS::Callbacks: fix run_callbacks for objects with negative id | Bogdan Gusiev | 2012-05-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #6372 from richo/bugs/middleware_stack_as_array | José Valim | 2012-05-17 | 2 | -2/+12 |
|\ \ | | | | | | | Add some common Array methods to the middleware stack | ||||
| * | | Add the #unshift method to the middleware stack | Rich Healey | 2012-05-18 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | The docs suggest that the middleware stack is an Array, so I've added the unshift method to it. Originally I added some more Array methods, but it was agreed that they lacked usecases. | ||||
* | | | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-17 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Render img tag with empty src if empty string is passed to image_tag. | ||||
| * | | | Render img tag with empty src if empty string is passed to image_tag. | Kirill Lashuk | 2012-05-18 | 2 | -2/+3 |
| |/ / | |||||
* | | | Merge pull request #5715 from soulim/add_time_input_control | Jeremy Kemper | 2012-05-17 | 8 | -3/+81 |
|\ \ \ | |/ / |/| | | Add HTML5 input[type="time"] helper | ||||
| * | | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 8 | -3/+81 |
|/ / | |||||
* | | Merge pull request #6371 from ihid/remove_old_text_helper_api | Rafael Mendonça França | 2012-05-17 | 3 | -69/+27 |
|\ \ | | | | | | | Removed old text_helper apis for highlight, excerpt and word_wrap | ||||
| * | | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 3 | -69/+27 |
|/ / | |||||
* | | Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵ | Jeremy Kemper | 2012-05-17 | 1 | -2/+2 |
| | | | | | | | | MiniTest deprecation message. | ||||
* | | Revert changes related to `bundle install` fixes in `rails new` | Piotr Sarnacki | 2012-05-17 | 2 | -17/+3 |
| | | | | | | | | | | | | | | | | | | | | | | Reverted changes: f3482a9 Fix tests in railties 5904295 improve #6318 aed906a prevent using already loaded Gemfile for 'bundle install' In order to fix this, we need a fix in bundler related to GEM_PATH, which will allow to run tests properly. I will get this changes back when it happens. | ||||
* | | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 2 | -4/+5 |
|\ \ | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 2 | -4/+5 |
| | | | |||||
* | | | Merge pull request #6238 from pwnall/pgsql_bytea_limit | Aaron Patterson | 2012-05-17 | 2 | -8/+20 |
|\ \ \ | | | | | | | | | Postgresql doesn't accept limits on binary (bytea) columns. | ||||
| * | | | Postgresql doesn't accept limits on binary (bytea) columns. | Victor Costan | 2012-05-09 | 2 | -8/+20 |
| | | | | |||||
* | | | | MiniTest deprecated #assert_block in favor of calling #assert with a block | Jeremy Kemper | 2012-05-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #6215 from erichmenge/fix_has_secure_password | Aaron Patterson | 2012-05-17 | 5 | -15/+43 |
|\ \ \ \ | | | | | | | | | | | Fix has secure password | ||||
| * | | | | Updated tests for has_secure_password. | Erich Menge | 2012-05-08 | 4 | -10/+33 |
| | | | | | |||||
| * | | | | has_secure_password shouldn't validate password_digest. It should also take ↵ | Erich Menge | 2012-05-08 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | options to turn validations off. | ||||
* | | | | | Update actionpack/CHANGELOG.md | José Valim | 2012-05-17 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 9 | -6/+36 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Created a Raw handler for templates. | ||||
| * | | | | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 9 | -6/+36 |
| | | | | | | | | | | | | | | | | | | | | Fixes #2394 | ||||
* | | | | | Merge pull request #6250 from iGEL/dont_destroy_readonly_models | Aaron Patterson | 2012-05-17 | 3 | -0/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Don't allow to destroy readonly models | ||||
| * | | | | | Don't destroy readonly models | Johannes Barre | 2012-05-17 | 3 | -0/+7 |
| | | | | | | |||||
* | | | | | | Make MockLogger work with blocks. | Rafael Mendonça França | 2012-05-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #6365 from kennyj/fix_warning_20120518 | Aaron Patterson | 2012-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix warning: ambiguous first argument. | ||||
| * | | | | | Fix warning: ambiguous first argument. | kennyj | 2012-05-18 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #6363 from markmcspadden/fix_duplicable_documentation | Vijay Dev | 2012-05-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix documentation around duplicable regarding Class and Module. | ||||
| * | | | | | Fix documentation around duplicable regarding Class and Module. | Mark McSpadden | 2012-05-17 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #6351 from bogdan/callbacks | José Valim | 2012-05-17 | 1 | -16/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | AS::Callbacks remove useless code, improve performance | ||||
| * | | | | | AS::Callbacks remove useless code, improve performance | Bogdan Gusiev | 2012-05-16 | 1 | -16/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #6058 from ↵ | Jon Leighton | 2012-05-17 | 5 | -7/+51 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects | ||||
| * | | | | | | Relation#from to accept other Relation objects | Radoslav Stankov | 2012-05-17 | 5 | -7/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a) | ||||
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 20 | -223/+311 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
| * | | | | | | | fix word_wrap eg output [ci skip] | Vijay Dev | 2012-05-17 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | copy edits assets guide [ci skip] | Vijay Dev | 2012-05-17 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | copy edit and remove nodoc on instance_values method [ci skip] | Vijay Dev | 2012-05-17 | 1 | -4/+4 |
| | | | | | | | |