aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #35529 from ↵Ryuta Kamizono2019-03-0926-34/+34
|\ \ \ | | | | | | | | | | | | | | | | abhaynikam/35492-follow-up-to-updates-links-to-https Updated links from http to https in guides, docs, etc
| * | | Updated links from http to https in guides, docs, etcAbhay Nikam2019-03-0926-34/+34
| |/ /
* | | Merge pull request #35550 from shailesh-kalamkar/minor-documentation-fixesXavier Noria2019-03-094-4/+4
|\ \ \ | | | | | | | | [ci skip] Minor documentation fixes for consistency
| * | | [ci skip] Minor documentation fixes for consistencyShailesh Kalamkar2019-03-094-4/+4
|/ / /
* | | Merge pull request #35548 from vishaltelangre/patch-1Vipul A M2019-03-091-10/+13
|\ \ \ | | | | | | | | Minor documentation fixes related to bulk insert [ci skip]
| * | | Minor documentation fixes related to bulk insert [skip ci]Vishal Telangre2019-03-091-10/+13
| | | |
* | | | Guides: Fix parent class of model test example (#35065)Sean Abrahams2019-03-091-1/+3
|/ / / | | | | | | | | | | | | | | | | | | * Fix parent class of model test example * include ActiveJob::TestHelper [ci skip]
* | | Merge pull request #35545 from sharang-d/relax-webpacker-versionYuji Yaginuma2019-03-093-3/+3
|\ \ \ | | | | | | | | Don't lock the webpacker gem by its patch version
| * | | Don't lock the webpacker gem by its patch versionSharang Dashputre2019-03-093-3/+3
|/ / /
* | | Fix "DEPRECATION WARNING: ActionView::Template#initialize requires a locals ↵yuuji.yaginuma2019-03-091-1/+1
| | | | | | | | | | | | | | | | | | parameter" Ref: #35411
* | | Merge pull request #35538 from sharang-d/use-latest-webpackerGuillermo Iguaran2019-03-087-4663/+7691
|\ \ \ | | | | | | | | Use the latest stable release of webpacker
| * | | Upgrade webpack-dev-server version in test appsSharang Dashputre2019-03-094-870/+458
| | | |
| * | | Use the latest stable release of webpackerSharang Dashputre2019-03-097-4005/+7445
| |/ /
* | | Merge pull request #35539 from sharang-d/replant-text-changesXavier Noria2019-03-081-2/+2
|\ \ \ | | | | | | | | Minor text changes to the db:seed:replant tests
| * | | Minor text changes to the db:seed:replant testsSharang Dashputre2019-03-091-2/+2
|/ / /
* | | Read the CSP nonce on page loadGeorge Claghorn2019-03-082-4/+10
| | | | | | | | | Turbolinks replaces the CSP nonce <meta> tag on page change, but inline scripts inserted by UJS need the nonce from the initial page load. In general, it doesn't matter to UJS if the nonce changes after the page loads: only the initial value is relevant.
* | | Merge pull request #35537 from ↵Xavier Noria2019-03-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | iarobinson/iarobinson/remove_painfully_from_action_mailer_basics Remove the word painfully from documentation
| * | | - Remove the word painfully from documentationiarobinson2019-03-081-1/+1
|/ / /
* | | Merge pull request #35536 from alexander-lazarov/improve-cache-docsXavier Noria2019-03-081-5/+5
|\ \ \ | | | | | | | | Improve wording in cache documentation
| * | | Improve wording in cache documentation [ci skip]Alexander Lazarov2019-03-081-5/+5
| | |/ | |/|
* | | moves a require to the file that needs itXavier Noria2019-03-082-1/+2
| | |
* | | Merge pull request #35533 from Shopify/zeitwerk-custom-inflectorsXavier Noria2019-03-084-6/+13
|\ \ \ | |_|/ |/| | Allow autoloader inflectors to be swaped out
| * | Allow autoloader inflectors to be swaped outJean Boussier2019-03-084-6/+13
|/ /
* | Merge pull request #35522 from gmcgibbon/rails_db_system_change_versioningKasper Timm Hansen2019-03-082-5/+30
|\ \ | |/ |/| Add version awareness to rails db:system:change
| * Add version awareness to rails db:system:changeGannon McGibbon2019-03-082-5/+30
| |
* | Merge pull request #35523 from y-yagi/build_assets_automatically_when_needYuji Yaginuma2019-03-081-0/+7
|\ \ | |/ |/| Build assets automatically if necessary
| * Build assets automatically if necessaryyuuji.yaginuma2019-03-081-0/+7
|/ | | | | | In CI, these are unnecessary because done by preprocessing. To test locally, you need to do it manually. If assets not exist, it will fail when a run specific test, so force to build those only when necessary.
* Merge pull request #35516 from soartec-lab/update_multiline_sample_codeRyuta Kamizono2019-03-081-2/+2
|\ | | | | Update `multiline?` sample code [ci skip]
| * Update `multiline?` sample code [ci skip]soartec-lab2019-03-071-2/+2
|/
* Merge pull request #35515 from soartec-lab/fix_sum_method_sample_codeRyuta Kamizono2019-03-071-1/+1
|\ | | | | Corrected execution result of Enumerable#sum [ci skip]
| * Corrected execution result of Enumerable#sum [ci skip]soartec-lab2019-03-071-1/+1
|/
* Merge pull request #35512 from kamipo/delegate_onlyRyuta Kamizono2019-03-073-2/+6
|\ | | | | Delegate `only` query method to relation as with `except`
| * Delegate `only` query method to relation as with `except`Ryuta Kamizono2019-03-073-2/+6
| | | | | | | | | | | | | | | | | | | | | | I've found the skewness of delegation methods between `except` and `only` in a88b6f2. The `only` method is closely similar with `except` as `SpawnMethods`. https://github.com/rails/rails/blob/e056b9bfb07c4eb3bcc6672d885aadd72bec574f/activerecord/lib/active_record/relation/spawn_methods.rb#L53-L67 It is preferable both behaves the same way.
* | Merge pull request #35514 from soartec-lab/learn_more_about_inflectionsVipul A M2019-03-071-1/+1
|\ \ | | | | | | Learn more about inflections[ci skip]
| * | Learn more about inflections[ci skip]soartec-lab2019-03-071-1/+1
| | |
* | | Merge pull request #35513 from utilum/update_raccRyuta Kamizono2019-03-071-1/+1
|\ \ \ | |/ / |/| | Update racc to latest version
| * | Update racc to latest versionutilum2019-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | racc 1.4.15 includes fixes for compiling with Ruby 2.7 since [ruby/ruby@3d1c86a](https://github.com/ruby/ruby/commit/3d1c86a). Before: ``` ruby -v ruby 2.7.0dev (2019-03-07 trunk 67189) [x86_64-linux] bundle install ... Fetching racc 1.4.14 Installing racc 1.4.14 with native extensions Gem::Ext::BuildError: ERROR: Failed to build gem native extension. current directory: /home/u/.rbenv/versions/2.7.0-dev/lib/ruby/gems/2.7.0/gems/racc-1.4.14/ext/racc /home/u/.rbenv/versions/2.7.0-dev/bin/ruby -I /home/u/.rbenv/versions/2.7.0-dev/lib/ruby/2.7.0 -r ./siteconf20190307-14242-16jzp6c.rb extconf.rb checking for rb_ary_subseq()... yes creating Makefile current directory: /home/u/.rbenv/versions/2.7.0-dev/lib/ruby/gems/2.7.0/gems/racc-1.4.14/ext/racc make "DESTDIR=" clean current directory: /home/u/.rbenv/versions/2.7.0-dev/lib/ruby/gems/2.7.0/gems/racc-1.4.14/ext/racc make "DESTDIR=" make: *** No rule to make target '/home/u/.rbenv/versions/2.7.0-dev/include/ruby-2.7.0/defines.h', needed by 'cparse.o'. Stop. make failed, exit code 2 Gem files will remain installed in /home/u/.rbenv/versions/2.7.0-dev/lib/ruby/gems/2.7.0/gems/racc-1.4.14 for inspection. Results logged to /home/u/.rbenv/versions/2.7.0-dev/lib/ruby/gems/2.7.0/extensions/x86_64-linux/2.7.0-static/racc-1.4.14/gem_make.out An error occurred while installing racc (1.4.14), and Bundler cannot continue. Make sure that `gem install racc -v '1.4.14' --source 'https://rubygems.org/'` succeeds before bundling. In Gemfile: racc ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 08:20:42 +0000