aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Minor fix to the wrapper tag documentation, the options hash is the last ↵Avi Tzurel2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one, added blank hash before that in the args list
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsAvi Tzurel2012-05-196-130/+155
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | move docs from CollectionAssociation to CollectionProxyFrancesco Rodriguez2012-05-182-114/+143
| | | | | | | | | | |
| | * | | | | | | | | add explanation of raising errors when a limit scope is supplied in ↵Francesco Rodriguez2012-05-181-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relation#delete_all
| | * | | | | | | | | Revert "Add oscardelben to authors"Oscar Del Ben2012-05-182-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 33284014c65f7cb0c342caeeda32baf10db71cfc. Reason: this change doesn't belong to DocRails.
| | * | | | | | | | | Fix typo.Peter Suschlik2012-05-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Added wrapper tag documentation to the simple_format methodAvi Tzurel2012-05-191-1/+4
| |/ / / / / / / / /
| * | | | | | | | | The middleware stack is compliant with Enumarable and bits of ArrayRich Healey2012-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to clarify the docs so that it's more clear how the stack behaves.
| * | | | | | | | | remove incorrect example of CollectionAssociation#empty?Francesco Rodriguez2012-05-181-17/+0
| | | | | | | | | |
| * | | | | | | | | add docs to CollectionAssociation#empty?Francesco Rodriguez2012-05-181-3/+32
| | | | | | | | | |
| * | | | | | | | | add docs to CollectionAssociation#any?Francesco Rodriguez2012-05-181-0/+30
| | | | | | | | | |
| * | | | | | | | | add examples to CollectionAssociation#concatFrancesco Rodriguez2012-05-181-3/+14
| | | | | | | | | |
| * | | | | | | | | fix CollectionAssociation docsFrancesco Rodriguez2012-05-171-1/+1
| | | | | | | | | |
| * | | | | | | | | add example to CollectionAssociation#destroy_allFrancesco Rodriguez2012-05-171-3/+14
| | | | | | | | | |
| * | | | | | | | | add more explanation to CollectionAssociation docsFrancesco Rodriguez2012-05-171-0/+4
| | | | | | | | | |
| * | | | | | | | | add CollectionAssociation hierarchyFrancesco Rodriguez2012-05-171-2/+7
| | | | | | | | | |
| * | | | | | | | | add docs to CollectionAssociation#many?Francesco Rodriguez2012-05-171-1/+34
| | | | | | | | | |
| * | | | | | | | | [engines] initializer method call needs an argument for initializer nameRyan Bigg2012-05-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Add oscardelben to authorsOscar Del Ben2012-05-172-0/+4
| | | | | | | | | |
| * | | | | | | | | fix CollectionAssociation#replace docsFrancesco Rodriguez2012-05-171-3/+3
| | | | | | | | | |
| * | | | | | | | | update AS docsVasiliy Ermolovich2012-05-171-6/+2
| | | | | | | | | |
| * | | | | | | | | Add docs to CollectionAssociation#replaceFrancesco Rodriguez2012-05-171-3/+23
| | | | | | | | | |
* | | | | | | | | | Add CHANGELOG entry for #6369 & #6391Andrew White2012-05-191-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4835 from ↵Carlos Antonio da Silva2012-05-191-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pacoguzman/refactor_define_restrict_dependency_method Refactor define_restrict_dependency_method using reflection
| * | | | | | | | | | Refactor define_restrict_dependency_method using reflectionPaco Guzman2012-02-011-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove sort on attributes.keys
| * | | | | | | | | | | Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-193-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition.
* | | | | | | | | | | | Remove delegated methods from generators test caseCarlos Antonio da Silva2012-05-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `class_attribute` already generates instance readers/writers by default, so there's no need to add delegation methods. Removes some "method redefined" warnings.
* | | | | | | | | | | | Remove warning in namespaced generator testCarlos Antonio da Silva2012-05-191-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Fix railties testsPiotr Sarnacki2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minitest uses different signature for assert_no_match, so we have to swap arguments.
* | | | | | | | | | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-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 White2012-05-193-17/+30
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-184-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Increase numeric-timestamp precision to nanoseconds
| * | | | | | | | | | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-194-3/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-182-14/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Tidied and standardised text_helper implementations.
| * | | | | | | | | | | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-192-14/+62
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6391 from strzalek/redirect_route_inspectPiotr Sarnacki2012-05-183-28/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect route inspect
| * | | | | | | | | | | | | Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-183-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łkowski2012-05-181-26/+18
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6183 from nashby/fix-issue-6179Jeremy Kemper2012-05-185-40/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrap time ranges with timezones
| * | | | | | | | | | | | | respect nsec in TimeWithZoneVasiliy Ermolovich + Sergey Nartimov2012-05-185-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 #6179Vasiliy Ermolovich2012-05-172-3/+20
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6388 from kennyj/fix_warning_20120519Rafael Mendonça França2012-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: possibly useless use of % in void context
| * | | | | | | | | | | | | | Fix warning: possibly useless use of % in void contextkennyj2012-05-191-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6387 from kennyj/fix_test_20120519Rafael Mendonça França2012-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build: can't convert Regexp to String
| * | | | | | | | | | | | | | | Fix build: can't convert Regexp to Stringkennyj2012-05-191-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | no longer need #delete_all_on_destroyJon Leighton2012-05-185-17/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-185-10/+47
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #6289