Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | some corrections in the AR query guide [ci skip] | Vijay Dev | 2012-05-05 | 1 | -13/+15 |
| | | | | | |||||
* | | | | | Merge pull request #6175 from mhfs/guide_take_first_last | Vijay Dev | 2012-05-05 | 1 | -8/+42 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update `first`, `last` and `take` in guides | ||||
| * | | | | Update `first`, `last` and `take` in guides | Marcelo Silveira | 2012-05-05 | 1 | -8/+42 |
|/ / / / | |||||
* | | | | Try to convert object passed to debug_hash to hash | Piotr Sarnacki | 2012-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SessionStore was recently changed to delegate to hash object instead of inherit from it. Since we don't want to extend SessionStore with every method implemented in Hash, it's better to just convert any object passed to debug_hash (which is also better as we don't require to pass Hash instance there, it can be any object that can be converted to Hash). | ||||
* | | | | Merge pull request #6169 from marcandre/respond_to_missing | José Valim | 2012-05-05 | 6 | -6/+24 |
|\ \ \ \ | |_|/ / |/| | | | Respond to missing | ||||
| * | | | Use respond_to_missing for TimeWithZone | Marc-Andre Lafortune | 2012-05-05 | 2 | -3/+4 |
| | | | | |||||
| * | | | Use respond_to_missing? for Chars | Marc-Andre Lafortune | 2012-05-05 | 2 | -2/+11 |
| | | | | |||||
| * | | | Use respond_to_missing? for OrderedOptions | Marc-Andre Lafortune | 2012-05-05 | 2 | -1/+9 |
| | | | | |||||
* | | | | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | closes #4894 | ||||
* | | | | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 3 | -2/+12 |
| | | | | |||||
* | | | | Change unless + ! into if | Piotr Sarnacki | 2012-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 2 | -2/+19 |
|\ \ \ \ | | | | | | | | | | | postgresql adapter should quote not a number and infinity correctly for float columns | ||||
| * | | | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 2 | -2/+19 |
| | | | | |