aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix "warning: assigned but unused variable - message"yuuji.yaginuma2017-10-121-2/+1
| | | | Ruby 2.5 warns about this. Ref: https://travis-ci.org/rails/rails/jobs/286338999
* Merge pull request #30855 from boone/fix_typosRafael França2017-10-104-6/+6
|\ | | | | Fix some typos [ci skip]
| * Fix some typos.Mike Boone2017-10-104-6/+6
|/
* Merge pull request #30850 from timsly/safe-redirect-backRafael França2017-10-102-7/+37
|\ | | | | Add allow_other_host option to redirect_back method
| * 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 rotations
| * Update security guide for signed cookie rotationsMichael Coyne2017-10-092-2/+22
|/ | | | | The example was slightly incorrect. This commit also adds a test case for this example to cookies middleware unit tests.
* Merge pull request #30595 from bogdanvlviv/use-railties-rails-commandMatthew Draper2017-10-106-249/+207
|\ | | | | Improve railties' tests
| * Improve RakeTest#test_db_test_prepare_when_using_sql_formatbogdanvlviv2017-10-081-3/+1
| | | | | | | | | | - Remove redundant setting `RAILS_ENV` for `db:test:prepare`. `db:test:prepare` doesn't require it.
| * Invoke rails command inside the railties' test app with ↵bogdanvlviv2017-10-083-16/+12
| | | | | | | | | | | | TestHelpers::Generation#rails See #30520
| * Remove redundant execution of `Dir.chdir(app_path) { }` in railties' testsbogdanvlviv2017-10-084-230/+194
| |
* | Merge pull request #30836 from ↵Matthew Draper2017-10-102-2/+9
|\ \ | | | | | | | | | | | | shioyama/generated_attribute_methods_include_mutex Include Mutex_m into GeneratedAttributeMethods instead of extending instance
| * | 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`
| * | | Simplify parse arguments in `ConsoleTest`yuuji.yaginuma2017-10-081-16/+3
| | | | | | | | | | | | | | | | | | | | If need a parse result of arguments, can obtain it by creating an instance of the command.
* | | | Merge pull request #30798 from ↵Sean Griffin2017-10-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bogdanvlviv/express-change_column_comment-as-public-api Express #change_column_comment as public api
| * | | | Express #change_column_comment as public apibogdanvlviv2017-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Implemented by #22911 Related to #30677
* | | | | Merge pull request #30843 from y-yagi/use_released_gemRyuta Kamizono2017-10-102-12/+7
|\ \ \ \ \ | | | | | | | | | | | | Use released `sidekiq` instead of master version
| * | | | | Use released `sidekiq` instead of master versionyuuji.yaginuma2017-10-092-12/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | The sidekiq 5.0.5 includes redis-rb 4.0 support. Ref: https://github.com/mperham/sidekiq/blob/90db3b84208cbb73a50d1a77a1dea97d3490ce70/Changes.md#505
* | | | | Joined tables in association scope doesn't use the same aliases with the ↵Ryuta Kamizono2017-10-097-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parent relation's aliases Building association scope in join dependency should respect the parent relation's aliases to avoid using the same alias name more than once. Fixes #30681.
* | | | | All test cases for `exists?` places in `finder_test.rb` to ease to find the ↵Ryuta Kamizono2017-10-092-26/+26
| | | | | | | | | | | | | | | | | | | | test cases
* | | | | 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]
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | I don't think this is a good abstraction because the internal method is used only if the relation need to be applied join dependency.
* | | | | Merge pull request #30838 from ↵Ryuta Kamizono2017-10-091-19/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/fix_rails_routes_log_in_getting_started_guide Fix the result of `rails routes` in Guide [ci skip]
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | `relation.exists?` should reference correct aliases while joining tables of has_many through associations.
* | | | | Missing revision 5efd21bb7ee4b326d9c0d26fccad10fc59dd51f0 in redis-rb-4.0 branchRyuta Kamizono2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | Seems the branch has rebased. cc @jeremy
* | | | | Merge pull request #30837 from y-yagi/fix_typo_in_loading_errorRyuta Kamizono2017-10-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in loading error message
| * | | | | Fix typo in loading error messageyuuji.yaginuma2017-10-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | s/Action Record/Active Record/
* | | | | Merge pull request #30748 from jeremy/redis-rb-4.0.1Jeremy Daer2017-10-089-30/+59
|\ \ \ \ \ | | | | | | | | | | | | redis-rb 4.0 support
| * | | | | redis-rb 4.0 supportJeremy Daer2017-10-089-30/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use `gem 'redis', '~> 4.0'` for new app Gemfiles * Loosen Action Cable redis-rb dep to `>= 3.3, < 5` * Bump redis-namespace for looser Redis version dep * Avoid using the underlying `redis.client` directly * Use `Redis.new` instead of `Redis.connect`
* | | | | | Merge pull request #30757 from jeremy/optional-dependency-hellscapeJeremy Daer2017-10-083-7/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adapters bubble up gem version mismatches for their dependencies
| * | | | | | Distinguish missing adapter gems from load errors within the adapterJeremy Daer2017-10-083-7/+32
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When the adapter is missing, raise an exception that points out config typos and missing Gemfile entries. (We can assume that a non-builtin adapter was used since these are always available.) * When loading an adapter raises a LoadError, prefix its error message to indicate that the adapter is likely missing an optional dependency.
* | | | | | 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 removing expired entries
| * | | | | Fixes ActiveSupport::Cache::FileStore#cleanup bug which prevented it from ↵Erich Soares Machado2017-10-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | cleaning up the expired cache keys
* | | | | | Merge pull request #30802 from khall/30662_long_variant_filenamesGeorge Claghorn2017-10-082-1/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Break long variant filenames into path chunks
| * | | | | Replace variation key use with SHA256 of key to prevent long filenameskhall2017-10-052-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a variant has a large set of options associated with it, the generated filename will be too long, causing Errno::ENAMETOOLONG to be raised. This change replaces those potentially long filenames with a much more compact SHA256 hash. Fixes #30662.
* | | | | | Merge pull request #30817 from yalab/friendly_exception_messageEileen M. Uchitelle2017-10-082-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Exception message for SystemTestCase#get etc..
| * | | | | | Exception message for SystemTestCase#get etc..yalab2017-10-082-6/+11
| | | | | | |
* | | | | | | Decouple building `AliasTracker` from `JoinDependency`Ryuta Kamizono2017-10-087-17/+16
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This is preparation to respect parent relation's alias tracking for fixing #30681.
* | | | | | Merge pull request #30831 from masatooba/fix-radio-button-tag-commentEileen M. Uchitelle2017-10-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix radio_button_tag comment
| * | | | | | Fix radio_button_tag commentMasato Oba2017-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Colons, periods, etc. can also be included in id. The sanitize_to_id method does not remove them.
* | | | | | | 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]
| * | | | | | Fix default of `String#to_time` [ci skip]yuuji.yaginuma2017-10-081-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | The default of `String#to_time` is `:local` since b79adc4.
* | | | | | Merge pull request #30822 from akshay-vishnoi/fix-typoRyuta Kamizono2017-10-072-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Fix typo
| * | | | | | [ci skip] Fix typoAkshay Vishnoi2017-10-072-2/+2
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 17:38:53 +0000