Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4835 from pacoguzman/refactor_define_restrict_dependency_... | Carlos Antonio da Silva | 2012-05-19 | 1 | -3/+3 |
|\ | |||||
| * | Refactor define_restrict_dependency_method using reflection | Paco Guzman | 2012-02-01 | 1 | -3/+3 |
* | | Merge pull request #5678 from troyk/patch-1 | Carlos Antonio da Silva | 2012-05-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Remove sort on attributes.keys | Troy Kruthoff | 2012-03-30 | 1 | -1/+1 |
* | | | Clarify grouped_options_for_select method API, add changelog entry | Carlos Antonio da Silva | 2012-05-19 | 3 | -16/+19 |
* | | | Remove delegated methods from generators test case | Carlos Antonio da Silva | 2012-05-19 | 1 | -1/+0 |
* | | | 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 |
* | | | Ensure that CollectionAssociation#replace returns proper target | Piotr Sarnacki | 2012-05-19 | 2 | -3/+3 |
* | | | 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 `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. | 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 |
|\ \ \ \ \ | |||||
| * | | | | | Fix inspecting route redirections, closes #6369 | Łukasz Strzałkowski | 2012-05-18 | 3 | -2/+15 |
| * | | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | respect nsec in TimeWithZone | Vasiliy Ermolovich + Sergey Nartimov | 2012-05-18 | 5 | -40/+48 |
| * | | | | | 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 | 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 | 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 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #6355 from amutz/fix_number_with_delimiter_escaping | Rafael Mendonça França | 2012-05-18 | 3 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reverting decoupling of NumberHelper from safe_join and adding tests for esca... | Andrew Mutz | 2012-05-18 | 3 | -1/+4 |
|/ / / / / / | |||||
* | | | | | | 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 | 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#% | 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 | 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 the #unshift method to the middleware stack | Rich Healey | 2012-05-18 | 2 | -2/+12 |
* | | | | | | 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. | 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 | 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 | Jeremy Walker | 2012-05-17 | 3 | -69/+27 |
|/ / / / / | |||||
* | | | | | Fix incorrect assert_block -> assert conversion. Assumed too much from the Mi... | Jeremy Kemper | 2012-05-17 | 1 | -2/+2 |
* | | | | | Revert changes related to `bundle install` fixes in `rails new` | Piotr Sarnacki | 2012-05-17 | 2 | -17/+3 |