aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #30850 from timsly/safe-redirect-backRafael França2017-10-102-7/+37
|\ \
| * | Add allow_other_host option to redirect_back methodTim Masliuchenko2017-10-102-7/+37
* | | Fix documentation [ci skip]Rafael Mendonça França2017-10-101-1/+1
* | | Merge pull request #30847 from mikeycgto/signed-cookie-rotation-updatesRafael França2017-10-102-2/+22
|\ \ \ | |/ / |/| |
| * | Update security guide for signed cookie rotationsMichael Coyne2017-10-092-2/+22
|/ /
* | Merge pull request #30595 from bogdanvlviv/use-railties-rails-commandMatthew Draper2017-10-106-249/+207
|\ \
| * | Improve RakeTest#test_db_test_prepare_when_using_sql_formatbogdanvlviv2017-10-081-3/+1
| * | Invoke rails command inside the railties' test app with TestHelpers::Generati...bogdanvlviv2017-10-083-16/+12
| * | Remove redundant execution of `Dir.chdir(app_path) { }` in railties' testsbogdanvlviv2017-10-084-230/+194
* | | Merge pull request #30836 from shioyama/generated_attribute_methods_include_m...Matthew Draper2017-10-102-2/+9
|\ \ \
| * | | Add test for class of GeneratedAttributeMethods instance in ancestorsChris Salzberg2017-10-091-0/+5
| * | | Include Mutex_m into module class instead of extending instanceChris Salzberg2017-10-081-2/+4
* | | | Merge pull request #30832 from y-yagi/simplify_console_testRyuta Kamizono2017-10-101-16/+3
|\ \ \ \
| * | | | Simplify parse arguments in `ConsoleTest`yuuji.yaginuma2017-10-081-16/+3
* | | | | Merge pull request #30798 from bogdanvlviv/express-change_column_comment-as-p...Sean Griffin2017-10-091-1/+1
|\ \ \ \ \
| * | | | | Express #change_column_comment as public apibogdanvlviv2017-10-041-1/+1
* | | | | | Merge pull request #30843 from y-yagi/use_released_gemRyuta Kamizono2017-10-102-12/+7
|\ \ \ \ \ \
| * | | | | | Use released `sidekiq` instead of master versionyuuji.yaginuma2017-10-092-12/+7
|/ / / / / /
* | | | | | Joined tables in association scope doesn't use the same aliases with the pare...Ryuta Kamizono2017-10-097-25/+36
* | | | | | All test cases for `exists?` places in `finder_test.rb` to ease to find the t...Ryuta Kamizono2017-10-092-26/+26
* | | | | | Merge pull request #30839 from yhirano55/use_form_with_in_engine_guideRyuta Kamizono2017-10-092-9/+9
|\ \ \ \ \ \
| * | | | | | Use `form_with` instead of `form_for` in engine guide [ci skip]Yoshiyuki Hirano2017-10-092-9/+9
| | |/ / / / | |/| | | |
* | | | | | Remove meaningless named `construct_relation_for_association_calculations`Ryuta Kamizono2017-10-092-6/+3
* | | | | | Merge pull request #30838 from yhirano55/fix_rails_routes_log_in_getting_star...Ryuta Kamizono2017-10-091-19/+21
|\ \ \ \ \ \
| * | | | | | Fix the result of `rails routes` in Guide [ci skip]Yoshiyuki Hirano2017-10-091-19/+21
| |/ / / / /
* | | | | | Fix `relation.exists?` with has_many through associationsRyuta Kamizono2017-10-092-4/+12
* | | | | | Missing revision 5efd21bb7ee4b326d9c0d26fccad10fc59dd51f0 in redis-rb-4.0 branchRyuta Kamizono2017-10-091-1/+1
* | | | | | Merge pull request #30837 from y-yagi/fix_typo_in_loading_errorRyuta Kamizono2017-10-091-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in loading error messageyuuji.yaginuma2017-10-091-1/+1
|/ / / / / /
* | | | | | Merge pull request #30748 from jeremy/redis-rb-4.0.1Jeremy Daer2017-10-089-30/+59
|\ \ \ \ \ \
| * | | | | | redis-rb 4.0 supportJeremy Daer2017-10-089-30/+59
* | | | | | | Merge pull request #30757 from jeremy/optional-dependency-hellscapeJeremy Daer2017-10-083-7/+32
|\ \ \ \ \ \ \
| * | | | | | | Distinguish missing adapter gems from load errors within the adapterJeremy Daer2017-10-083-7/+32
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Remove passing redundant `self` to internal `apply_join_dependency` etcRyuta Kamizono2017-10-091-13/+12
* | | | | | | Merge pull request #30789 from erichmachado/file-store-cache-cleanup-fixGeorge Claghorn2017-10-082-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixes ActiveSupport::Cache::FileStore#cleanup bug which prevented it from cle...Erich Soares Machado2017-10-032-3/+3
* | | | | | | Merge pull request #30802 from khall/30662_long_variant_filenamesGeorge Claghorn2017-10-082-1/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Replace variation key use with SHA256 of key to prevent long filenameskhall2017-10-052-1/+6
* | | | | | | Merge pull request #30817 from yalab/friendly_exception_messageEileen M. Uchitelle2017-10-082-6/+11
|\ \ \ \ \ \ \
| * | | | | | | Exception message for SystemTestCase#get etc..yalab2017-10-082-6/+11
* | | | | | | | Decouple building `AliasTracker` from `JoinDependency`Ryuta Kamizono2017-10-087-17/+16
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #30831 from masatooba/fix-radio-button-tag-commentEileen M. Uchitelle2017-10-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix radio_button_tag commentMasato Oba2017-10-081-1/+1
* | | | | | | | Merge pull request #30835 from y-yagi/fix_default_of_to_timeRyuta Kamizono2017-10-081-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix default of `String#to_time` [ci skip]yuuji.yaginuma2017-10-081-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #30822 from akshay-vishnoi/fix-typoRyuta Kamizono2017-10-072-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix typoAkshay Vishnoi2017-10-072-2/+2
* | | | | | | | Merge pull request #30826 from yhirano55/update_instrumentation_guide_for_act...Ryuta Kamizono2017-10-071-0/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Instrumentation guide for Active Storage [ci skip]Yoshiyuki Hirano2017-10-071-0/+47
* | | | | | | | | Merge pull request #30825 from y-yagi/remove_needless_setupRyuta Kamizono2017-10-071-13/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |