aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #23121 from prathamesh-sonpatki/fix-testsYves Senn2016-01-191-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix test failure on PostgreSQL by sorting the result before comparisonPrathamesh Sonpatki2016-01-191-4/+5
|/ / / / / /
* | | | | | run `type` column through attribtues API type casting.Yves Senn2016-01-193-0/+84
* | | | | | Merge pull request #23117 from vipulnsward/22297-ar-exception-raiseAbdelkader Boudih2016-01-191-1/+1
|\ \ \ \ \ \
| * | | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordInvalid` e...Vipul A M2016-01-191-1/+1
* | | | | | | Merge pull request #23116 from vipulnsward/22648-html-safe-textप्रथमेश Sonpatki2016-01-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make text about render :html option clearer to state, text will get escaped i...Vipul A M2016-01-191-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #23114 from y-yagi/refer_to_rails_command_instead_of_rake_...Kasper Timm Hansen2016-01-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | refer to rails command instead of rake in environment erroryuuji.yaginuma2016-01-191-2/+2
* | | | | | | Merge pull request #23112 from prathamesh-sonpatki/association-guides-fixesKasper Timm Hansen2016-01-191-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix discrepancies in associations guide [ci skip]Prathamesh Sonpatki2016-01-191-6/+6
|/ / / / / / /
* | | | | | | Merge pull request #23110 from amitsuroliya/application_recordप्रथमेश Sonpatki2016-01-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | `ApplicationRecord` instead of `ActiveRecord::Base` in Association Guides [c...amitkumarsuroliya2016-01-191-2/+2
|/ / / / / /
* | | | | | Remove incomplete filter runs all tests in plugins.Kasper Timm Hansen2016-01-181-8/+0
* | | | | | Don't run all tests when files end in a colon.Kasper Timm Hansen2016-01-182-9/+1
* | | | | | Merge pull request #23099 from vipulnsward/change_start_at_end_atKasper Timm Hansen2016-01-185-92/+56
|\ \ \ \ \ \
| * | | | | | Changed options for find_each and variants to have options start/finish inste...Vipul A M2016-01-185-92/+56
* | | | | | | Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_filesKasper Timm Hansen2016-01-182-2/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | CodeStatistic will now ignore hidden files:Edouard CHIN2016-01-182-2/+15
* | | | | | | Merge pull request #21555 from amitsuroliya/associated_basicsJon Moss2016-01-183-230/+230
|\ \ \ \ \ \ \
| * | | | | | | Association Guide replaces Order as example with Author-Book Example [ci skip]amitkumarsuroliya2016-01-183-230/+230
|/ / / / / / /
* | | | | | | Merge pull request #22705 from RochesterinNYC/add-order-explanation-to-first-...Jon Moss2016-01-181-2/+28
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add clarification about `first` and `last` behavior when using `order` [ci skip]James Wen2015-12-201-2/+28
* | | | | | | Merge pull request #23088 from prathamesh-sonpatki/update-gemfile-lockSantiago Pastorino2016-01-181-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Checked in changes to Gemfile.lock on latest masterPrathamesh Sonpatki2016-01-171-2/+1
* | | | | | | | Merge pull request #22394 from j-dexx/update_association_basics_guideJon Moss2016-01-181-3/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated the guides for having a distinct has_many through at the database levelJames Doyley2016-01-181-3/+13
* | | | | | | | | Merge pull request #23096 from HayleyCAnderson/ha-action-cable-docsJon Moss2016-01-181-20/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve Action Cable configuration explanationsHayley Anderson2016-01-181-20/+31
* | | | | | | | | | Merge pull request #23097 from prathamesh-sonpatki/psql-hstoreYves Senn2016-01-181-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Explain how HStore columns can be queried [ci skip]Prathamesh Sonpatki2016-01-181-0/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23098 from vipulnsward/changelog-passKasper Timm Hansen2016-01-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Pass through AP CHANGELOG [ci skip]Vipul A M2016-01-181-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23085 from maclover7/fix-17030Kasper Timm Hansen2016-01-174-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove ActionView dependence on ActionPack's Mime implementationJon Moss2016-01-174-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23089 from kaspth/better-template-typesKasper Timm Hansen2016-01-171-15/+14
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Store the symbols as an array.Kasper Timm Hansen2016-01-171-1/+1
| * | | | | | | | Enrich the SET constant to respond to symbols.Kasper Timm Hansen2016-01-171-1/+5
| * | | | | | | | Don't bother looking up the types.Kasper Timm Hansen2016-01-171-3/+3
| * | | | | | | | Replace class attribute with SET constant.Kasper Timm Hansen2016-01-171-3/+2
| * | | | | | | | Remove register abstraction.Kasper Timm Hansen2016-01-171-7/+1
| * | | | | | | | Replace delegate calls with standard method defs.Kasper Timm Hansen2016-01-171-1/+4
| * | | | | | | | Spare to_sym call in `==`.Kasper Timm Hansen2016-01-171-2/+1
| * | | | | | | | Make ref return the internal symbol.Kasper Timm Hansen2016-01-171-1/+1
|/ / / / / / / /
* | | | | | | | Remove literal? check to fix issue with prefixed optionalseileencodes2016-01-162-1/+13
* | | | | | | | Merge pull request #23008 from tawan/avoid-multiple-default-pathsEileen M. Uchitelle2016-01-162-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid multiple default paths to server.pid fileTawan Sierek2016-01-162-1/+12
|/ / / / / / / /
* | | | | | | | Fix the updated API (this sorts the concurrent-ruby switch with Basecamp)David Heinemeier Hansson2016-01-161-1/+1
* | | | | | | | Revert "Merge pull request #22977 from rails/revert-22934-master"David Heinemeier Hansson2016-01-1615-36/+46
* | | | | | | | Merge pull request #20046 from yoongkang/ladidaRafael Mendonça França2016-01-163-1/+20
|\ \ \ \ \ \ \ \