Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add passing tests for generating URLs with nested SCRIPT_NAMEs | Jeremy Kemper | 2012-05-07 | 2 | -3/+17 |
| | |||||
* | Merge pull request #6064 from gazay/fix_guides_for_as_core_ext | Xavier Noria | 2012-05-07 | 3 | -68/+82 |
|\ | | | | | Fix guides for as core ext | ||||
| * | Changes for numeric api for Time because Time.current works different | Alexey Gaziev | 2012-05-07 | 2 | -7/+7 |
| | | |||||
| * | Added tests for comparsion operator for Range | Alexey Gaziev | 2012-05-07 | 1 | -0/+12 |
| | | |||||
| * | Fix some guides for AS core_ext | Alexey Gaziev | 2012-05-07 | 1 | -64/+66 |
| | | |||||
* | | Merge pull request #6191 from arunagw/ruby_prof_lock | Piotr Sarnacki | 2012-05-07 | 1 | -1/+1 |
|\ \ | | | | | | | Locking ruby-prof for now. | ||||
| * | | Locking ruby-prof for now. | Arun Agrawal | 2012-05-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Need to investigate why build is failing because of ruby-prof. | ||||
* | | | Merge pull request #5368 from andhapp/remove-max-stale | José Valim | 2012-05-07 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Minor test improvement | ||||
| * | | | Removed max-stale from the tests since it's a request cache-control ↵ | Anuj Dutta | 2012-03-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | directive, just for clarity sake. | ||||
* | | | | Merge pull request #6182 from shaliko/change_unless_else_into_if_else | José Valim | 2012-05-07 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | Change unless + else into if + else | ||||
| * | | | Change unless + else into if + else | Shaliko Usubov | 2012-05-06 | 1 | -3/+3 |
| | | | | |||||
* | | | | note that WIP guides are not in the index menu [ci skip] | Vijay Dev | 2012-05-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix build | Piotr Sarnacki | 2012-05-06 | 1 | -7/+10 |
| | | | | |||||
* | | | | Ensure that Rails.env is equal to "test" by default when running tests. | Piotr Sarnacki | 2012-05-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Rails.env when running tests on localhost differs from travis ci which makes it harder to write tests that check env related things. | ||||
* | | | | [guides] Add comments to deep_dup example, fix second example [ci skip] | Piotr Sarnacki | 2012-05-06 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #5910 from route/rails-dbconsole | Jeremy Kemper | 2012-05-06 | 3 | -40/+86 |
|\ \ \ \ | | | | | | | | | | | Fast path starts the database console without loading the full Rails env | ||||
| * | | | | More faster rails dbconsole | Dmitry Vorotilin | 2012-05-06 | 3 | -40/+86 |
| | | | | | |||||
* | | | | | Fix that optimized named routes should also work as singleton methods on the ↵ | Jeremy Kemper | 2012-05-06 | 2 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | url_helpers module | ||||
* | | | | | Remove obsolete deep_dup requires | Piotr Sarnacki | 2012-05-06 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Use deep_dup in aciverecord default columns assignment | Piotr Sarnacki | 2012-05-06 | 1 | -4/+2 |
| | | | | | |||||
* | | | | | Keep all methods in object/deep_dup | Piotr Sarnacki | 2012-05-06 | 6 | -18/+17 |
| | | | | | |||||
* | | | | | Updated CHANGELOG entry for `deep_dup` | Piotr Sarnacki | 2012-05-06 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Reword guide entry for `deep_dup` method. | Piotr Sarnacki | 2012-05-06 | 1 | -14/+23 |
| | | | | | |||||
* | | | | | Guides for deep_dup | Alexey Gaziev | 2012-05-06 | 1 | -0/+64 |
| | | | | | |||||
* | | | | | Nice logic for deep_dup in rails | Alexey Gaziev | 2012-05-06 | 8 | -19/+72 |
|/ / / / | |||||
* | | | | doc edits [ci skip] | Vijay Dev | 2012-05-06 | 1 | -3/+2 |
| | | | | |||||
* | | | | Merge pull request #5924 from cjolly/signed-cookies-docs | Vijay Dev | 2012-05-06 | 1 | -3/+5 |
|\ \ \ \ | |/ / / |/| | | | Improve signed cookies documentation | ||||
| * | | | Improve signed cookies documentation | Chad Jolly | 2012-04-21 | 1 | -3/+5 |
| | | | | |||||
* | | | | Merge pull request #6180 from soulim/fix_submit_tag_doc | Vijay Dev | 2012-05-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix typo in submit_tag helper documentation | ||||
| * | | | | Fix typo in submit_tag helper documentation | Alex Soulim | 2012-05-06 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Update actionpack/CHANGELOG.md | José Valim | 2012-05-06 | 1 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #2313 from ssoroka/master | José Valim | 2012-05-06 | 5 | -15/+33 |
|\ \ \ \ | | | | | | | | | | | Raise a rescuable exception, rather than responding with a head :not_acceptable (406) | ||||
| * | | | | remove .new from raise ActionController::UnknownFormat | Steven Soroka | 2012-05-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | added an integration test that checks ActionController::UnknownFormat ↵ | Steven Soroka | 2012-05-06 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | renders 406 :not_acceptable | ||||
| * | | | | Raise a rescuable exception when Rails doesn't know what to do with the ↵ | Steven Soroka | 2012-05-06 | 4 | -15/+24 |
|/ / / / | | | | | | | | | | | | | format, rather than responding with a head :not_acceptable (406) | ||||
* | | | | Merge pull request #6173 from mhfs/takes_instead_first | Jeremy Kemper | 2012-05-05 | 3 | -5/+17 |
|\ \ \ \ | | | | | | | | | | | Use `take` instead of `first` to avoid unwanted implicit ordering. Closes #6147. | ||||
| * | | | | Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147) | Marcelo Silveira | 2012-05-05 | 3 | -5/+17 |
| | | | | | |||||
* | | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysql | Jeremy Kemper | 2012-05-05 | 6 | -1/+54 |
|\ \ \ \ \ | | | | | | | | | | | | | Use strict mode in mysql | ||||
| * | | | | | Changelog entry regarding mysql(2) STRICT_ALL_TABLES | Michael Pearson | 2012-05-05 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. | Michael Pearson | 2012-05-05 | 4 | -4/+38 |
| | | | | | | |||||
| * | | | | | Default to 'strict mode' in MySQL | Michael Pearson | 2012-05-05 | 2 | -0/+11 |
| | | | | | | |||||
| * | | | | | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is ↵ | Michael Pearson | 2012-05-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | required to keep MySQL happy. | ||||
* | | | | | | Merge pull request #6054 from flexoid/column-fix | Jon Leighton | 2012-05-05 | 2 | -3/+31 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Prevent creating valid time-like objects from blank string from db | ||||
| * | | | | | | Prevent creating valid time-like objects from blank string from db | Egor Lynko | 2012-05-05 | 2 | -3/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #6045 | ||||
* | | | | | | | Revert "Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 4 | -43/+6 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge" This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing changes made to 58a49875df63729f07a9a81d1ee349087d258df5. | ||||
* | | | | | | Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 4 | -6/+43 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge ActiveRecord::Relation - maintain context of joined associations on merges | ||||
| * | | | | | | Allow ActiveRecord::Relation merges to maintain context of joined associations | Jared Armstrong | 2012-05-04 | 4 | -6/+43 |
| | | | | | | | |||||
* | | | | | | | Make RedCloth not convert double hyphens to emdashes. Closes #5292 | Vijay Dev | 2012-05-06 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in http://redcloth.org/textile/writing-paragraph-text/#dashes RedCloth converts double hyphens to emdashes. This causes problems in the guides where options like --database, --full are rendered incorrectly. This commit fixes it by customizing the emdash method in the RedCloth::Formatters::HTML module to just return '--'. See their FAQ http://redcloth.org/faq in the section 'How do I customize RedCloth?' | ||||
* | | | | | | | Merge pull request #6176 from nashby/checkboxes | José Valim | 2012-05-05 | 2 | -1/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | check checkboxes with array of strings as :checked option | ||||
| * | | | | | | | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 2 | -1/+10 |
| | |_|/ / / / | |/| | | | | |