aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update URL in RELEASING_RAILS.md [ci skip]nisusam2019-03-131-1/+1
| | | | | * Update valid link for `signing release tag` from `git-scm` book * Use `en`(English) instead of `tr`(Turkish) documentation link
* Remove unused `Row` class in `SelectManager`Ryuta Kamizono2019-03-131-12/+0
| | | | The `Row` class is no longer used since d956772b3c61d97940ebcccd7c83e2397ca0c36c.
* Initialize `@default_timezone` and `@timestamp_decoder` in `add_pg_decoders`Ryuta Kamizono2019-03-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Staled `@default_timezone` would cause an error on `reconnect!` after `disconnect!`. https://buildkite.com/rails/rails/builds/59495#23be8079-3a4f-4375-9991-0a6f874554f2 Steps to reproduce: ``` % ARCONN=postgresql bin/test test/cases/adapter_test.rb test/cases/base_test.rb -n "/(?:test_attributes_on_dummy_time|test_reconnect_after_a_disconnect)$/" --seed 15849 Using postgresql Run options: -n "/(?:test_attributes_on_dummy_time|test_reconnect_after_a_disconnect)$/" --seed 15849 # Running: . E Error: ActiveRecord::AdapterTestWithoutTransaction#test_reconnect_after_a_disconnect: NoMethodError: undefined method `add_coder' for #<PG::TypeMapAllStrings:0x00007f85ab9dd5b8> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:866:in `update_typemap_for_default_timezone' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:652:in `exec_no_cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:636:in `execute_and_clear' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:894:in `add_pg_decoders' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:744:in `connect' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:285:in `rescue in block in reconnect!' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:281:in `block in reconnect!' /Users/kamipo/.rbenv/versions/2.6.1/lib/ruby/2.6.0/monitor.rb:230:in `mon_synchronize' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:280:in `reconnect!' /Users/kamipo/src/github.com/rails/rails/activerecord/test/cases/adapter_test.rb:465:in `block in <class:AdapterTestWithoutTransaction>' ```
* Merge pull request #35585 from sharang-d/changelog-updateRafael França2019-03-121-4/+3
|\ | | | | Edit a changelog entry [ci skip]
| * Edit a changelog entry [ci skip]Sharang Dashputre2019-03-121-4/+3
| |
* | Merge pull request #35583 from cpruitt/add-addititonal-tests-for-dummy-erbEileen M. Uchitelle2019-03-121-0/+54
|\ \ | | | | | | Add additional ERB DummyCompiler tests
| * | Add additional ERB DummyCompiler testsCliff Pruitt2019-03-121-0/+54
| |/ | | | | | | This adds a few additional tests to the commits by eileencodes (https://github.com/rails/rails/pull/35497) and rafaelfranca (https://github.com/rails/rails/commit/cfa22f1a4b5e8b95ee01a432168de2f831b3f788). The additional tests cover several more ERB tag formatting cases such as multiline tags, conditional statements that result in duplicate keys, and multiple erb statements on a single line.
* | Merge pull request #35577 from sharang-d/typo-opt-outVipul A M2019-03-123-13/+13
|\ \ | | | | | | Change wording of some instances of 'opt out' [ci skip]
| * | Change wording of some instances of 'opt out' [ci skip]Sharang Dashputre2019-03-123-13/+13
| | |
* | | Merge pull request #35586 from KurtRMueller/masterRyuta Kamizono2019-03-131-1/+1
|\ \ \ | |_|/ |/| | Update small typo in documentation.
| * | Update small typo in documentation.Kurt Mueller2019-03-121-1/+1
|/ /
* | Merge pull request #35581 from prathamesh-sonpatki/action_mailbox_errorKasper Timm Hansen2019-03-122-0/+5
|\ \ | | | | | | Show friendly message to install action mailbox if the related table does not exist
| * | Show friendly message to install action mailbox if the related table does ↵Prathamesh Sonpatki2019-03-122-0/+5
| | | | | | | | | | | | | | | | | | not exist - This is similar to the work done in https://github.com/rails/rails/pull/31534
* | | Merge pull request #35582 from vipulnsward/kill-warning-from-guidesKasper Timm Hansen2019-03-121-1/+1
|\ \ \ | | | | | | | | Fix warnings from Guides generation
| * | | After https://github.com/rails/rails/pull/35281 and ↵Vipul A M2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/35036 AV warns about not having the compiled container. Use the suggested with_empty_template_cache to overcome warning
* | | | Merge pull request #35530 from Rodrigora/patch-1Vipul A M2019-03-121-0/+11
|\ \ \ \ | |/ / / |/| | | Add note about has_many associations callbacks [ci skip]
| * | | Add note about has_many associations callbacks [ci skip]Rodrigo2019-03-121-0/+11
| | | | | | | | | | | | | | | | Add a note explaining when the has_many associations callbacks will be called or not.
* | | | Merge pull request #35575 from sharang-d/changelog-for-parameterizeRyuta Kamizono2019-03-121-1/+13
|\ \ \ \ | |_|_|/ |/| | | | | | | Add changelog entry for transliterate/parameterize accepting `locale` [ci skip]
| * | | Add changelog entry for transliterate/parameterize accepting `locale` [ci skip]Sharang Dashputre2019-03-121-0/+10
| | | |
* | | | Merge pull request #35424 from Korri/validation-rules-locale-fallbackRafael França2019-03-113-11/+56
|\ \ \ \ | | | | | | | | | | Fall back to parent locale before falling back to the :errors namespace
| * | | | Update Changelog with new locale fallback behavior on validationHugo Vacher2019-03-111-0/+24
| | | | |
| * | | | Fall back to parent locale before it falls back to the :errors namespaceHugo Vacher2019-03-042-11/+32
| | | | |
* | | | | bump Zeitwerk to 1.3.3Xavier Noria2019-03-112-4/+4
| | | | |
* | | | | Merge pull request #35576 from sharang-d/fix-typo-overridenVipul A M2019-03-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | overriden -> overridden [ci skip]
| * | | | overriden -> overridden [ci skip]Sharang Dashputre2019-03-121-1/+1
|/ / / /
* | | | Do not generate dummy string when the tag used is not the <%=Rafael Mendonça França2019-03-112-1/+5
| | | |
* | | | Merge pull request #35572 from sharang-d/tests-for-transliterate-locale-argKasper Timm Hansen2019-03-114-1/+19
|\ \ \ \ | | | | | | | | | | Add test for 'ActiveSupport::Inflector.transliterate'
| * | | | Fix bug with parametrize when `locale` is passedSharang Dashputre2019-03-124-1/+19
| | | | | | | | | | | | | | | | | | | | Also add tests for parametrize and transliterate
* | | | | Merge pull request #34955 from bogdanvlviv/follow-up-33962Kasper Timm Hansen2019-03-113-3/+9
|\ \ \ \ \ | | | | | | | | | | | | Add `config.credentials.content_path` and `config.credentials.key_path` to the guide
| * | | | | Add `config.credentials.content_path` and `config.credentials.key_path` to ↵bogdanvlviv2019-01-173-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the guide - Fix some typos Follow up #33962
* | | | | | [ci skip] Improve `encrypted` commands USAGEKasper Timm Hansen2019-03-111-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This streamlines the lovely foundation Bogdan added. Mainly to add guidance around encryption keys and remove some backticks. Finally it adds some mention of how to access these files from Ruby in apps. [ Kasper Timm Hansen & bogdanvlviv ]
* | | | | | Merge pull request #34965 from bogdanvlviv/improve-rails-encrypted--helpKasper Timm Hansen2019-03-112-0/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Improve output of `rails encrypted(:edit/:show) --help`
| * | | | | Improve output of `rails encrypted(:edit/:show) --help`bogdanvlviv2019-01-172-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these simple examples, It will be easier for users to figure out how to use these commands. Related to 68479d09ba6bbd583055672eb70518c1586ae534
* | | | | | Merge pull request #35571 from KaanOzkan/ko-parameterize-localeRafael França2019-03-112-10/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add locale option to #parameterize
| * | | | | Add locale option to parameterizeKaan Ozkan2019-03-112-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameterize is triggering I18n#transliterate. This method already accepts a locale. It would be cleaner if similar to other string inflection methods #parameterize also accepted 'locale' as a parameter.
* | | | | | Merge pull request #35485 from excid3/default-attachable-trix-partialJavan Makhmali2019-03-115-2/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Adds default trix content attachmment partial path
| * | | | | Adds default trix partialChris Oliver2019-03-055-2/+31
| | | | | |
* | | | | | Merge pull request #35570 from ↵Ryuta Kamizono2019-03-111-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | shailesh-kalamkar/fix-routing-expanded-option-example [ci skip] Fixed expanded option route example
| * | | | | | [ci skip] Removed extra hyphensShailesh Kalamkar2019-03-111-4/+4
| | | | | | |
* | | | | | | Merge pull request #35568 from prathamesh-sonpatki/server_squishRyuta Kamizono2019-03-116-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Squish the deprecation messages across the codebase
| * | | | | | | Squish the deprecation messages across the codebasePrathamesh Sonpatki2019-03-116-8/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample example -> Before: prathamesh@Prathameshs-MacBook-Pro-2 blog *$ rails server thin DEPRECATION WARNING: Passing the Rack server name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -u option instead. After: prathamesh@Prathameshs-MacBook-Pro-2 squish_app *$ rails server thin DEPRECATION WARNING: Passing the Rack server name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -u option instead.
* | | | | | | Merge pull request #35569 from prathamesh-sonpatki/env-varsKasper Timm Hansen2019-03-112-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mention `environment variable` instead of just `environment`
| * | | | | | | Mention `environment variable` instead of just `environment`Prathamesh Sonpatki2019-03-112-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #35566 from prathamesh-sonpatki/server-uKasper Timm Hansen2019-03-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use the -u switch for the `rails server` banner
| * | | | | | | Use the -u switch for the `rails server` bannerPrathamesh Sonpatki2019-03-111-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Because just passing the server argument to this command is deprecated in https://github.com/rails/rails/pull/32058
* / / / / / / Fix style issues and build source after #35525Kasper Timm Hansen2019-03-112-4/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran `cd actioncable && yarn build`. [ Kasper Timm Hansen & Ryan Castner ]
* | | | | | Merge pull request #35525 from ↵Kasper Timm Hansen2019-03-112-3/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | audiolion/feature/dynamic-actioncable-websocket-url feat(js): Dynamic Actioncable WebSocket URL
| * | | | | | address pr feedbackRyan Castner2019-03-091-6/+2
| | | | | | | | | | | | | | | | | | | | | change if statement to ternary, use const for consistency, add spacing after ternary expression
| * | | | | | feat(js): Dynamic Actioncable WebSocket URLRyan Castner2019-03-072-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow createWebSocketURL fn to accept a function to generate the websocket URL rather than a string.
* | | | | | | Merge pull request #35565 from ↵Kasper Timm Hansen2019-03-111-33/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahonda/rm_test_create_table_with_custom_sequence_name Remove `MigrationTest#test_create_table_with_custom_sequence_name`
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 19:55:18 +0000