aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Update rails-html-sanitizer version to v1.0.3Karim El-Husseiny2016-02-081-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23560 from prathamesh-sonpatki/rm-rails-4-from-assets-guideप्रथमेश Sonpatki2016-02-081-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove references to Rails 4 from assets guide [ci skip]Prathamesh Sonpatki2016-02-081-9/+9
* | | | | | | | | | Merge pull request #23552 from bronson/revert-dev-cacheKasper Timm Hansen2016-02-086-54/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | revert dev:cache to rake task, fixes #23410Scott Bronson2016-02-076-54/+49
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23558 from kamipo/add_numeric_type_in_docVipul A M2016-02-081-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add numeric type in the doc [ci skip]Ryuta Kamizono2016-02-081-3/+3
* | | | | | | | | | Merge pull request #23556 from y-yagi/remove_faye-websocket_from_readmeप्रथमेश Sonpatki2016-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove `faye-websocket` dependency from README [ci skip]yuuji.yaginuma2016-02-081-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23554 from romaimperator/update_action_cable_config_exampleJon Moss2016-02-071-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config examples for ActionCable now use Rails.application.config.action_cableDaniel Fox2016-02-071-3/+3
* | | | | | | | | | | Merge pull request #23559 from mabras/patch-1Richard Schneeman2016-02-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | update turbolinks url [ci skip]mabras2016-02-081-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23547 from kamipo/schema_type_returns_symbolSean Griffin2016-02-073-8/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | `schema_type` returns symbol rather than stringRyuta Kamizono2016-02-083-8/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #23508 from meinac/add_numeric_type_into_migrationsSean Griffin2016-02-072-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added numeric helper into migrations.Mehmet Emin İNAÇ2016-02-072-0/+12
* | | | | | | | | | Merge pull request #23531 from coldnebo/docfixJon Moss2016-02-072-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc changesLarry Kyrala2016-02-072-3/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23532 from matthewd/live-interlockMatthew Draper2016-02-084-48/+252
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Manual yield doesn't block new sharesMatthew Draper2016-02-081-5/+6
| * | | | | | | | | | Test the happy path for recursive yields tooMatthew Draper2016-02-081-0/+35
| * | | | | | | | | | Fix a nonsensical ShareLock test.thedarkone2016-02-071-22/+21
| * | | | | | | | | | Eagerly reacquire when start_sharing is nested inside yield_sharesMatthew Draper2016-02-081-11/+18
| * | | | | | | | | | AS::Conc::ShareLock#yield_shares tests.thedarkone2016-02-071-0/+107
| * | | | | | | | | | Hand off the interlock to the new thread in AC::LiveMatthew Draper2016-02-074-38/+93
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Add SVG as a default mime typeDavid Heinemeier Hansson2016-02-072-0/+5
* | | | | | | | | | Merge pull request #23540 from vipulnsward/publish-api-apps-docVijay Dev2016-02-071-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Publish guide on "Using Rails for API-only Applications"Vipul A M2016-02-071-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Separate for new and existing applications clearlyVijay Dev2016-02-071-0/+4
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-02-074-15/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix indentationVijay Dev2016-02-071-1/+1
| * | | | | | | | | | [ci skip] Good bye SQLite2yui-knk2016-02-061-2/+0
| * | | | | | | | | | [ci skip] fix typoMikhail Dieterle2016-01-301-1/+1
| * | | | | | | | | | [ci skip] Fix one more typoPrathamesh Sonpatki2016-01-301-1/+1
| * | | | | | | | | | [ci skip] Update internal documents about ActiveRecord's Reflectionyui-knk2016-01-301-11/+14
| * | | | | | | | | | [ci skip] Fix typoyui-knk2016-01-271-1/+1
* | | | | | | | | | | Merge pull request #23533 from y-yagi/fix_typo_in_assert_enqueued_jobs_exampleJon Moss2016-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix typo in `assert_enqueued_jobs` example [ci skip]yuuji.yaginuma2016-02-071-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23519 from kamipo/mariadb_does_not_support_json_typeSean Griffin2016-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MariaDB does not support JSON typeRyuta Kamizono2016-02-061-1/+1
* | | | | | | | | | | Avoid coupling Action Pack to Railties.Kasper Timm Hansen2016-02-061-1/+1
* | | | | | | | | | | Merge pull request #23529 from syamilmj/remove_unused_methodRafael França2016-02-061-4/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Remove unused private methodSyamil MJ2016-02-071-4/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23520 from kamipo/remove_duplicated_require_arelSean Griffin2016-02-061-1/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove duplicated `require 'arel'`Ryuta Kamizono2016-02-061-1/+0
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23517 from gsamokovarov/yay-youre-on-railsEileen M. Uchitelle2016-02-062-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Replace old Rails greeting referencesGenadi Samokovarov2016-02-062-2/+2
* | | | | | | | | Merge pull request #23513 from kamipo/revert-23502-update-travis-masterKasper Timm Hansen2016-02-061-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "No need to specify Ruby patch version on Travis CI"Ryuta Kamizono2016-02-061-2/+2