aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into actioncable_loggingkp2016-02-10258-1531/+3186
|\
| * Merge pull request #21671 from kaspth/integration-request-encoding-helpersDavid Heinemeier Hansson2016-02-102-4/+122
| |\
| | * Add `as` to encode a request as a specific mime type.Kasper Timm Hansen2016-01-042-4/+122
| * | Merge pull request #22772 from gsamokovarov/nack-template-errorDavid Heinemeier Hansson2016-02-101-0/+4
| |\ \
| | * | Fix edge case with ActionView::Template::Error reraiseGenadi Samokovarov2015-12-231-0/+4
| * | | Merge pull request #23512 from y-yagi/set_association_name_to_fixtureDavid Heinemeier Hansson2016-02-103-11/+10
| |\ \ \
| | * | | set association name to generated fixtures if attribute is referenceyuuji.yaginuma2016-02-063-11/+10
| * | | | Merge pull request #23587 from wallclockbuilder/patch-1Vipul A M2016-02-101-1/+1
| |\ \ \ \
| | * | | | Fix tiny grammar.Mawueli Kofi Adzoe2016-02-091-1/+1
| |/ / / /
| * | | | Merge pull request #23586 from jhcole/masterप्रथमेश Sonpatki2016-02-101-2/+2
| |\ \ \ \
| | * | | | Fix typoJohn Cole2016-02-091-2/+2
| |/ / / /
| * | | | Merge pull request #23584 from mgm702/fix_grammar_errors_in_security_and_migr...Jon Moss2016-02-092-4/+4
| |\ \ \ \
| | * | | | Fixed grammatical errors in rails docs [ci skip]Matt Michnal2016-02-092-4/+4
| |/ / / /
| * | | | prevent apps in the railties test suite from running the evented monitorXavier Noria2016-02-101-3/+12
| * | | | include spring-watcher-listen in the Gemfile of new applicationsXavier Noria2016-02-103-0/+9
| * | | | enables the evented monitor in new applicationsXavier Noria2016-02-105-1/+35
| * | | | `log_process_action` will return an array, so use `empty?`Aaron Patterson2016-02-091-1/+1
| * | | | Request#fullpath should not raise an exception, so remove the rescueAaron Patterson2016-02-091-1/+1
| * | | | AC::Request#format always returns a value, so we do not need to tryAaron Patterson2016-02-091-1/+1
| * | | | Merge pull request #23577 from dgynn/docs_initializersRafael França2016-02-091-4/+16
| |\ \ \ \
| | * | | | Update documentation regarding initializers [ci skip]Dave Gynn2016-02-091-4/+16
| |/ / / /
| * | | | Merge pull request #23571 from y-yagi/remove_deprecated_render_nothing_from_g...Vipul A M2016-02-091-1/+1
| |\ \ \ \
| | * | | | remove description of `render :nothing` from guide [ci skip]yuuji.yaginuma2016-02-091-1/+1
| |/ / / /
| * | | | Merge pull request #23567 from kamipo/fix_typoJon Moss2016-02-081-1/+1
| |\ \ \ \
| | * | | | Fix typo [ci skip]Ryuta Kamizono2016-02-091-1/+1
| |/ / / /
| * | | | drop array allocations on `html_safe`Aaron Patterson2016-02-081-1/+1
| * | | | speed up string xor operation and reduce object allocationsAaron Patterson2016-02-081-1/+2
| * | | | Merge pull request #23565 from abhishekjain16/fix_grammarJon Moss2016-02-081-1/+1
| |\ \ \ \
| | * | | | [ci skip] Fix grammarAbhishek Jain2016-02-091-1/+1
| * | | | | Merge pull request #23534 from bronson/fix-redefined-warningArthur Nogueira Neves2016-02-081-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix 'method redefined' warningsScott Bronson2016-02-061-0/+1
| * | | | | Merge pull request #23563 from pra85/patch-2Jon Moss2016-02-081-1/+1
| |\ \ \ \ \
| | * | | | | Fix a typoPrayag Verma2016-02-081-1/+1
| |/ / / / /
| * | | | | Revert "Merge pull request #23562 from Azzurrio/patch-1"Rafael Mendonça França2016-02-081-1/+1
| * | | | | Merge pull request #23562 from Azzurrio/patch-1Kasper Timm Hansen2016-02-081-1/+1
| |\ \ \ \ \
| | * | | | | 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
| | | |/ / / | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 03:11:49 +0000