aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pull the action methods directly onto the adapterMatthew Draper2016-01-188-56/+51
* Add Postgres adapterJon Moss2016-01-183-0/+111
* Refactor storage_adapterJon Moss2016-01-181-11/+3
* Adapterize ActionCable storage and extract behaviorJon Moss2016-01-1817-50/+173
* 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
|\ \ \ \
| * | | | Use ActiveSupport::SafeBuffer when flushing content_forYoong Kang Lim2015-05-253-1/+20
* | | | | Merge pull request #20005 from kamipo/default_expression_supportRafael França2016-01-1611-44/+100
|\ \ \ \ \
| * | | | | Fix extract default with CURRENT_TIMESTUMPRyuta Kamizono2016-01-133-2/+24
| * | | | | Fix extract default with CURRENT_DATERyuta Kamizono2016-01-131-3/+8
| * | | | | Add expression support on the schema defaultRyuta Kamizono2016-01-138-39/+68
* | | | | | Merge pull request #22985 from akshay-vishnoi/fix-typoRafael França2016-01-161-1/+1
|\ \ \ \ \ \
| * | | | | | test `include?`- fix typoAkshay Vishnoi2016-01-091-1/+1
* | | | | | | Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi...Rafael França2016-01-163-24/+16
|\ \ \ \ \ \ \
| * | | | | | | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-153-24/+16
* | | | | | | | Merge pull request #23079 from y-yagi/fix_log_clear_exampleRafael França2016-01-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | remove unnecessary `ENV[]` from `log:clear` example [ci skip]yuuji.yaginuma2016-01-161-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-...Richard Schneeman2016-01-152-19/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix intermittent test failuresschneems2016-01-141-0/+1
| * | | | | | | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-142-19/+58
* | | | | | | | | Merge pull request #22278 from poporul/masterGodfrey Chan2016-01-152-6/+14
|\ \ \ \ \ \ \ \ \