Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove warning in namespaced generator test | Carlos Antonio da Silva | 2012-05-19 | 1 | -1/+1 |
| | |||||
* | Fix railties tests | Piotr Sarnacki | 2012-05-19 | 1 | -1/+1 |
| | | | | | Minitest uses different signature for assert_no_match, so we have to swap arguments. | ||||
* | Ensure that CollectionAssociation#replace returns proper target | Piotr Sarnacki | 2012-05-19 | 2 | -3/+3 |
| | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association. | ||||
* | Improve `rake routes` output for redirects - closes #6369. | Andrew White | 2012-05-19 | 3 | -17/+30 |
| | |||||
* | Merge pull request #6376 from jgaskins/timestamp-microseconds | Jeremy Kemper | 2012-05-18 | 4 | -3/+6 |
|\ | | | | | Increase numeric-timestamp precision to nanoseconds | ||||
| * | Increase `AR#cache_key` precision to nanoseconds | Jamie Gaskins | 2012-05-19 | 4 | -3/+6 |
| | | |||||
* | | Merge pull request #6384 from ihid/tidy_text_helpers | Jeremy Kemper | 2012-05-18 | 2 | -14/+62 |
|\ \ | | | | | | | Tidied and standardised text_helper implementations. | ||||
| * | | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 2 | -14/+62 |
| | | | |||||
* | | | Merge pull request #6391 from strzalek/redirect_route_inspect | Piotr Sarnacki | 2012-05-18 | 3 | -28/+33 |
|\ \ \ | | | | | | | | | Redirect route inspect | ||||
| * | | | Fix inspecting route redirections, closes #6369 | Łukasz Strzałkowski | 2012-05-18 | 3 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301) | ||||
| * | | | More DRY route inspect tests | Łukasz Strzałkowski | 2012-05-18 | 1 | -26/+18 |
|/ / / | |||||
* | | | Merge pull request #6183 from nashby/fix-issue-6179 | Jeremy Kemper | 2012-05-18 | 5 | -40/+65 |
|\ \ \ | | | | | | | | | wrap time ranges with timezones | ||||
| * | | | respect nsec in TimeWithZone | Vasiliy Ermolovich + Sergey Nartimov | 2012-05-18 | 5 | -40/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we pass fractional usec to Time methods we should use Rational instead of Float because of accuracy problem Time.local(2011,6,12,23,59,59,999999.999).nsec # => 999999998 Time.local(2011,6,12,23,59,59,Rational(999999999, 1000)).nsec # => 999999999 | ||||
| * | | | wrap time ranges with timezones, closes #6179 | Vasiliy Ermolovich | 2012-05-17 | 2 | -3/+20 |
| | | | | |||||
* | | | | Merge pull request #6388 from kennyj/fix_warning_20120519 | Rafael Mendonça França | 2012-05-18 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix warning: possibly useless use of % in void context | ||||
| * | | | | Fix warning: possibly useless use of % in void context | kennyj | 2012-05-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6387 from kennyj/fix_test_20120519 | Rafael Mendonça França | 2012-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix build: can't convert Regexp to String | ||||
| * | | | | | Fix build: can't convert Regexp to String | kennyj | 2012-05-19 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | fix #delete_all with habtm with :delete_sql | Jon Leighton | 2012-05-18 | 2 | -0/+7 |
| | | | | | |||||
* | | | | | no longer need #delete_all_on_destroy | Jon Leighton | 2012-05-18 | 5 | -17/+2 |
| | | | | | |||||
* | | | | | Perf: Don't load the association for #delete_all. | Jon Leighton | 2012-05-18 | 5 | -10/+47 |
|/ / / / | | | | | | | | | | | | | Bug #6289 | ||||
* | | | | 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 |