aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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`
| * | | | | | | | | Remove `MigrationTest#test_create_table_with_custom_sequence_name`Yasuo Honda2019-03-111-33/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is only executed for OracleAdapter. https://github.com/rsim/oracle-enhanced/pull/1846 adds an equivalent spec for Oracle enhanced adapter.
* | | | | | | | | Merge pull request #35564 from prathamesh-sonpatki/expanded-routes-guideKasper Timm Hansen2019-03-111-1/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add example of the output of `rails routes --expanded` in the routing guide [ci skip]
| * | | | | | | | | Add example of the output of `rails routes --expanded` in the routing guide ↵Prathamesh Sonpatki2019-03-111-1/+28
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - Instead of the note at the end, added an example of how the output looks by using the expanded switch.
* | | | | | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2019-03-111-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An `author` has a lots of `posts` in the fixtures, so the result of `author.post` and finding a `post` by `author_id` is non-deterministic. https://travis-ci.org/rails/rails/jobs/504332292#L1202-L1208
* | | | | | | | | Merge pull request #35320 from ↵Ryuta Kamizono2019-03-113-2/+78
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamille-gz/fix_query_method_when_given_Date_data_type Fix ActiveRecord query attribute method when given value does't respond to to_i method
| * | | | | | | | | Fix query attribute method on user-defined attribute to be aware of ↵kamille-3212019-03-113-2/+78
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typecasted value change the line to check an attribute has user-defined type ref: https://github.com/rails/rails/pull/35320#discussion_r257924552 check query attribute method is working when given value does not respond to to_i method
* | | | | | | | | Merge pull request #35449 from pjrebsch/quoting-empty-rangeRyuta Kamizono2019-03-113-2/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Quote empty ranges like other empty enumerables
| * | | | | | | | | Quote empty ranges like other empty enumerablesPatrick Rebsch2019-03-073-2/+20
| |/ / / / / / / /
* | | | | | | | | Merge pull request #35121 from utilum/warning_tried_to_create_proc_without_blockKasper Timm Hansen2019-03-109-18/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ruby 2.7 warning: creating a Proc without a block
| * | | | | | | | | ActionPack Proc.new without a blockutilum2019-02-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes cases that use pre Ruby [r66772](https://bugs.ruby-lang.org/projects/ruby-trunk/repository/trunk/revisions/66772) syntax that are not tickled by the test suite.
| * | | | | | | | | Ruby 2.7 warning: creating a Proc without a blockutilum2019-02-137-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of [Revision 66772]( https://bugs.ruby-lang.org/projects/ruby-trunk/repository/trunk/revisions/66772) `Proc.new` without giving a block emits `warning: tried to create Proc object without a block`. This commit fixes cases where Rails test suit tickles this warning. See CI logs: https://travis-ci.org/rails/rails/jobs/487205819#L1161-L1190 https://travis-ci.org/rails/rails/jobs/487205821#L1154-1159 https://travis-ci.org/rails/rails/jobs/487205821#L1160-L1169 https://travis-ci.org/rails/rails/jobs/487205821#L1189 https://travis-ci.org/rails/rails/jobs/487254404#L1307-L1416 https://travis-ci.org/rails/rails/jobs/487254405#L1174-L1191
* | | | | | | | | | Merge pull request #35549 from r7kamura/feature/response-charsetRyuta Kamizono2019-03-102-4/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Support other optional parameters and quoted-strings on Content-Type parser
| * | | | | | | | | | Support other optional parameters and quoted-strings on Content-Type parserr7kamura2019-03-102-4/+37
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #35559 from ↵Kasper Timm Hansen2019-03-098-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ashishprajapati/ashishprajapati/important_textual_improvements Added missing guide links in documentation and minor wording fix
| * | | | | | | | | | | Added missing guide links in README documentation and minor wording fix [ci ↵ashishprajapati2019-03-108-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip]
* | | | | | | | | | | | PostgreSQL: Add `add_pg_encoders` and `add_pg_decoders` in `connect`Ryuta Kamizono2019-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is to work that on `reconnect!` after `disconnect!`. https://buildkite.com/rails/rails/builds/59378#1efea538-cfca-4d43-8b7e-ae78e97227c8
* | | | | | | | | | | | Don't test `disconnect!` if in memory dbRyuta Kamizono2019-03-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `disconnect!` will lose all tables and fixtures if in memory db.
* | | | | | | | | | | | Merge pull request #35557 from sharang-d/revert-jquery-changeXavier Noria2019-03-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Revert an incorrect change in jquery-2.2.0.js
| * | | | | | | | | | | | Revert an incorrect change in jquery-2.2.0.jsSharang Dashputre2019-03-101-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | SQLite3: Set `busy_timeout` in `configure_connection`Ryuta Kamizono2019-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is to work that on `reconnect!` after `disconnect!`
* | | | | | | | | | | | Fix `reconnect!` to work after `disconnect!`Ryuta Kamizono2019-03-103-11/+25
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #35555 from ↵Ryuta Kamizono2019-03-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shailesh-kalamkar/fix-autosave-association-test-typo Fix autosave_association_test.rb typo
| * | | | | | | | | | | | Fixed autosave association test typoShailesh Kalamkar2019-03-091-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #35552 from abhaynikam/fix-remaining-set-of-links-in-gemspecRyuta Kamizono2019-03-1019-33/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update some more links to https
| * | | | | | | | | | | | Fix links in gemspec and docs from http to https.Abhay Nikam2019-03-0919-33/+33
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #35553 from sharang-d/update-upsert_all-docRyuta Kamizono2019-03-091-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update upsert_all documentation [ci skip]
| * | | | | | | | | | | | | Update upsert_all documentation [ci skip]Sharang Dashputre2019-03-091-3/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #35527 from tight/improve_doc_of_automatic_inverse_ofRyuta Kamizono2019-03-091-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve doc of automatic inverse_of detection [ci skip]
| * | | | | | | | | | | | Improve doc of automatic inverse_of detectionFrançois D2019-03-081-2/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #35531 from boblail/issue-35519Ryuta Kamizono2019-03-091-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation on upsert_all so that it is correct for Postgres [ci skip]
| * | | | | | | | | | | | | Update documentation on upsert_all so that it is correct for PostgresBob Lail2019-03-081-3/+7
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details in https://github.com/rails/rails/issues/35519 In short, MySQL and Sqlite3 allow a record to be both inserted _and_ replaced in the same operation. Postgres (and the SQL-2003 rules for MERGE) do not. Postgres's rationale seems to be that the operation would be nondeterministic. I think it's OK for Rails users to have a different experience with this feature depending on their database; but I think you should be able to follow the examples in the docs on any database.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 12:06:40 +0000