aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23687 from vipulnsward/add-on-weekdayDavid Heinemeier Hansson2016-02-154-1/+24
|\
| * Add `#on_weekday?` method to `Date`, `Time`, and `DateTime`.Vipul A M2016-02-154-1/+24
* | Merge pull request #23684 from vs4vijay/masterEileen M. Uchitelle2016-02-151-1/+1
|\ \
| * | Corrected secret_key_basevs4vijay2016-02-151-1/+1
|/ /
* | Merge pull request #23569 from Gaurav2728/no_doc_of_some_railtie_methodsVipul A M2016-02-151-4/+7
|\ \
| * | mark as #:nodoc: [ci skip]Gaurav Sharma2016-02-151-4/+7
* | | Merge pull request #23664 from y-yagi/remove_test_order_from_environment_fileYves Senn2016-02-151-3/+0
|\ \ \
| * | | remove `active_support.test_order` from environment fileyuuji.yaginuma2016-02-141-3/+0
* | | | Merge pull request #23667 from meinac/remove_override_methodYves Senn2016-02-151-13/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove the method already overridden by private methodMehmet Emin İNAÇ2016-02-141-13/+0
| |/ /
* | | Merge pull request #23670 from yui-knk/update_dalliYves Senn2016-02-151-1/+1
|\ \ \
| * | | Update dalli gemyui-knk2016-02-141-1/+1
| |/ /
* | | Merge pull request #23678 from kamipo/remove_deprecated_never_unpermitted_paramsEileen M. Uchitelle2016-02-142-16/+0
|\ \ \
| * | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`Ryuta Kamizono2016-02-152-16/+0
|/ / /
* | | Merge pull request #23505 from kaspth/inject-rails-config-through-railtieKasper Timm Hansen2016-02-146-54/+16
|\ \ \
| * | | Don't rely on the global server as a receiver.Kasper Timm Hansen2016-02-143-10/+4
| * | | Default connection class to ActionCable::Connection::Base.Kasper Timm Hansen2016-02-144-18/+6
| * | | Inject Rails' channel paths in engine.Kasper Timm Hansen2016-02-145-26/+6
* | | | Merge pull request #23674 from xw19/dev-tools-updateJon Moss2016-02-141-0/+1
|\ \ \ \
| * | | | [ci skip] line_statistics added to READMESourav Moitra2016-02-141-0/+1
|/ / / /
* | | | Merge pull request #23648 from xw19/link_to-data-nil-testYves Senn2016-02-142-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Test to check if the data-attr if nil is same or notSourav Moitra2016-02-142-0/+7
|/ / /
* | / restores the guides layout header [ci skip]Xavier Noria2016-02-131-1/+11
| |/ |/|
* | Merge pull request #23660 from meinac/change_x_gzip_to_gzipJon Moss2016-02-132-3/+3
|\ \
| * | Change x-gzip to gzip in docs [ci skip]Mehmet Emin İNAÇ2016-02-132-3/+3
* | | Merge pull request #23377 from bogdan/last-with-sqlEileen M. Uchitelle2016-02-134-17/+78
|\ \ \
| * | | Make ActiveRecord::Relation#last to reverse SQL orderBogdan Gusiev2016-02-134-17/+78
* | | | Merge pull request #23654 from kamipo/fix_grammar_a_to_anJon Moss2016-02-1314-14/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix grammar `a` to `an` [ci skip]Ryuta Kamizono2016-02-1314-14/+14
* | | | Merge pull request #23655 from y-yagi/add_missing_option_to_exampleKasper Timm Hansen2016-02-131-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | add missing name option to flash test example [ci skip]yuuji.yaginuma2016-02-131-2/+2
* | | | Merge pull request #23653 from kamipo/add_missing_author_nameVipul A M2016-02-131-0/+2
|\ \ \ \
| * | | | Add the missing author name [ci skip]Ryuta Kamizono2016-02-131-0/+2
|/ / / /
* / / / push kwargs up to the user facing APIAaron Patterson2016-02-123-13/+13
|/ / /
* | | Fix expected hash syntax.Kasper Timm Hansen2016-02-121-3/+3
* | | Prefer empty? to any?.Kasper Timm Hansen2016-02-121-1/+1
* | | Stop mutating return value.Kasper Timm Hansen2016-02-121-2/+3
* | | Inline `fetch_or_cache_partial`.Kasper Timm Hansen2016-02-121-10/+6
* | | Write to collection cache where the template is rendered.Kasper Timm Hansen2016-02-122-9/+15
|/ /
* | Only write to collection cache if we have a callable cache key.Kasper Timm Hansen2016-02-122-16/+13
* | Check `partial_rendered_times` to clarify expectations.Kasper Timm Hansen2016-02-121-1/+4
* | Use Ruby 1.9 hash syntaxRafael Mendonça França2016-02-121-1/+1
* | Remove useless callable_cache_key? check.Kasper Timm Hansen2016-02-121-2/+1
* | Test collection caching with callable cache key.Kasper Timm Hansen2016-02-121-0/+25
* | the lookup context looks in the cwd, so prefix isn't necessaryAaron Patterson2016-02-121-2/+1
* | use a real LookupContext in the digest testsAaron Patterson2016-02-121-28/+6
* | Remove single_template_render? method.Kasper Timm Hansen2016-02-121-5/+1
* | Don't search in locals for cache_options.Kasper Timm Hansen2016-02-121-3/+1
* | use assert_not_equal so there will be better error messagesAaron Patterson2016-02-121-1/+1
* | use kwargs to avoid hash slicingAaron Patterson2016-02-121-3/+3