aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10634 from teleological/time_advance_gregorianAndrew White2014-01-052-4/+13
|\
| * Maintain proleptic gregorian in Time#advanceRiley Lynch2013-05-152-4/+13
* | Merge pull request #13598 from zirni/remove_ar_warningsRafael Mendonça França2014-01-052-2/+2
|\ \
| * | Remove method redefined warnings for test suiteMatthias Zirnstein2014-01-052-2/+2
* | | Switched to use `display:none` in extra_tags_for_form method.Gaelian Ditchburn2014-01-056-8/+14
* | | Unique the segment keys array for non-optimized url helpersAndrew White2014-01-053-1/+31
* | | Show full route constraints in error messageAndrew White2014-01-054-4/+40
* | | Simplify arg parameterizationAndrew White2014-01-051-6/+1
* | | Use a custom route vistor for optimized route generationAndrew White2014-01-054-31/+65
* | | Merge pull request #13590 from kuldeepaggarwal/fix-date-helper-docRafael Mendonça França2014-01-041-1/+1
|\ \ \ | |/ / |/| |
| * | provide correct example of `datetime_select` helper [ci skip]Kuldeep Aggarwal2014-01-041-1/+1
* | | Add preview_path to autoload_paths in after_initializeAndrew White2014-01-043-7/+55
|/ /
* | Merge pull request #13587 from kud86/change_truncate_examplesRobin Dupret2014-01-041-0/+3
|\ \
| * | Fixed documentation. [ci skip]Konstantin Wlasow2014-01-041-0/+3
|/ /
* | Fix mergefail in changelogJon Leighton2014-01-041-2/+0
* | Add deprecation I accidentally missedJon Leighton2014-01-041-1/+1
* | Merge pull request #13584 from tjschuck/cannot_cannot_be_can_notXavier Noria2014-01-0314-71/+71
|\ \
| * | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-0314-71/+71
* | | Merge pull request #13583 from arthurnn/mem_cache_store_fixGuillermo Iguaran2014-01-033-10/+12
|\ \ \
| * | | Raise if MemCacheStore doenst receive a Dalli objArthur Neves2014-01-033-0/+15
| * | | mem_cache_store requires dalli, so only accept dalli/clientArthur Neves2014-01-032-14/+1
* | | | Minor typo fix [ci skip]Robin Dupret2014-01-031-1/+1
| |/ / |/| |
* | | Merge pull request #10134 from derikson/collection_proxy_select_with_multiple...Rafael Mendonça França2014-01-033-6/+10
|\ \ \ | |/ / |/| |
| * | Changed ActiveRecord::Associations::CollectionProxy#select to take multiple a...Dan Erikson2013-04-083-6/+10
* | | No need to use fixed size font [ci skip]Rafael Mendonça França2014-01-031-2/+2
* | | Merge pull request #13579 from prathamesh-sonpatki/issue-13552Rafael Mendonça França2014-01-031-2/+6
|\ \ \
| * | | Fix documentation for end_year option of date_helper [ci skip]Prathamesh Sonpatki2014-01-031-2/+6
* | | | Whitespace [ci skip]Rafael Mendonça França2014-01-031-1/+1
* | | | Building new records with enum scopes now works as expectedGodfrey Chan2014-01-033-12/+15
* | | | Deprecate unused `symbolized_base_class` and `symbolized_sti_name`.Yves Senn2014-01-033-0/+10
|/ / /
* | | Merge pull request #13578 from schneems/schneems/database_url-env-defaultRafael Mendonça França2014-01-0212-19/+12
|\ \ \
| * | | Use DATABASE_URL by defaultschneems2014-01-0212-19/+12
|/ / /
* | | Merge pull request #13573 from kuldeepaggarwal/doc-fix-default-valuesRafael Mendonça França2014-01-021-2/+2
|\ \ \
| * | | provide correct information [ci skip]Kuldeep Aggarwal2014-01-021-2/+2
* | | | Merge pull request #13528 from jonleighton/maintain_test_schemaJon Leighton2014-01-0217-58/+173
|\ \ \ \
| * | | | Automatically maintain test database schemaJon Leighton2014-01-0217-58/+173
|/ / / /
* / / / Reverse 821525e and wrap run_generator callAndrew White2014-01-022-4/+14
|/ / /
* | | Adding missing requireRafael Mendonça França2014-01-021-0/+1
* | | Enable fast_finish in the travis configurationRafael Mendonça França2014-01-021-0/+1
* | | Merge pull request #13569 from schneems/schneems/default-url-sub-keyRafael Mendonça França2014-01-0111-12/+26
|\ \ \
| * | | Move default production database to URL sub keyschneems2014-01-0111-12/+26
* | | | Downgrade bundler until 1.5.2 is availableAndrew White2014-01-011-1/+1
|/ / /
* | | Merge pull request #13542 from robin850/issue-13530Rafael Mendonça França2014-01-013-3/+21
|\ \ \
| * | | Improve enum documentationRobin Dupret2014-01-011-1/+6
| * | | Fix the enums writer methodsRobin Dupret2014-01-013-2/+15
* | | | Add CHANGELOG entry for #13557 [ci skip]Rafael Mendonça França2014-01-012-1/+4
* | | | Merge pull request #13557 from gmarik/patch-1Rafael Mendonça França2014-01-012-1/+18
|\ \ \ \
| * | | | add test casegmarik2013-12-311-0/+17
| * | | | Use `Array#wrap` instead `Array()`gmarik2013-12-311-1/+1
* | | | | Removed elipsis indicating that the reader should have more code than what is...Mo Omer2014-01-011-2/+0