aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not try to set the content_type if the format is nilRafael Mendonça França2016-12-051-1/+1
|
* Merge pull request #26266 from jmccartie/jm/bigintSean Griffin2016-12-0522-74/+332
|\ | | | | Change Default Primary Keys to BIGINT
| * Make pg adapter use bigserial for pk by defaultPavel Pravosud2016-12-0511-3/+262
| |
| * Change MySQL and Postgresql to use Bigint primary keysJon McCartie2016-12-0516-75/+74
|/
* Merge pull request #27272 from ↵Sean Griffin2016-12-054-1/+65
|\ | | | | | | | | kamipo/make_auto_increment_to_internal_primary_key_option Make `:auto_increment` to internal primary key option
| * Make `:auto_increment` to internal primary key optionRyuta Kamizono2016-12-064-1/+65
|/ | | | | | Using `:auto_increment` option for abstracting the DB-specific auto incremental types. It is worth to ease to implement the compatibility layer.
* Don't try to run multiple insert queries at onceSean Griffin2016-12-051-5/+9
| | | | | | | | | | | | | SQLite's default query interface ignores anything after the first semicolon in a query. This is actually quite common behavior in database drivers, especially when dealing with code paths for prepared statements (which we are). While this should only affect SQLite, as I'm not aware of any drivers which don't support multi-insert. Even if this does affect other third party drivers though, I'd prefer not to assume that more than one query can be executed per call to `execute`. Fixes #26948. Close #27242.
* Merge pull request #27269 from amaierhofer/adjust_link_to_api_docSean Griffin2016-12-051-4/+3
|\ | | | | [ci skip] Remove button reference in `link_to` api doc
| * Update url_helper.rb, adjust link_to api docAndreas Maierhofer2016-12-051-4/+3
| | | | | | | | | | Removed references to `button` in the `link_to` `disable_with` api description.
* | Merge pull request #27264 from kamipo/fix_change_column_lose_commentSean Griffin2016-12-052-2/+5
|\ \ | |/ |/| Fix that `change_column` lose a comment
| * Fix that `change_column` lose a commentRyuta Kamizono2016-12-052-2/+5
| |
* | Merge pull request #27267 from prathamesh-sonpatki/fullstopKasper Timm Hansen2016-12-051-1/+1
|\ \ | | | | | | Add fullstop following the pattern used in rest of the file
| * | Add fullstop following the pattern used in rest of the filePrathamesh Sonpatki2016-12-051-1/+1
|/ /
* | Merge pull request #27266 from simi/patch-1Guillermo Iguaran2016-12-041-1/+1
|\ \ | |/ |/| Fix binstop -> binstub typo in railties changelog. [ci-skip]
| * Fix binstop -> binstub typo in railties changelog.Josef Šimánek2016-12-051-1/+1
|/ | | [ci skip]
* Merge pull request #27258 from y-yagi/stop_using_removed_render_textKasper Timm Hansen2016-12-034-5/+5
|\ | | | | stop using removed `render :text`
| * stop using removed `render :text`yuuji.yaginuma2016-12-034-5/+5
| | | | | | | | Follow up to 79a5ea9eadb4d43b62afacedc0706cbe88c54496
* | Merge pull request #27257 from koic/use_standard_name_javascriptXavier Noria2016-12-031-1/+1
|\ \ | | | | | | Use JavaScripts instead of Javascripts in `rake stats`
| * | Use JavaScripts instead of Javascripts in `rake stats`Koichi ITO2016-12-031-1/+1
|/ /
* | Remove unused argumentRafael Mendonça França2016-12-022-16/+5
| | | | | | | | Now Text class is only used to render text mime type pages
* | Merge pull request #27250 from y-yagi/use_binstub_in_bin_updateGuillermo Iguaran2016-12-011-1/+1
|\ \ | |/ |/| use yarn binstub in `bin/update`
| * use yarn binstub in `bin/update`yuuji.yaginuma2016-12-021-1/+1
|/ | | | Follow up to 3dac36bd8e26363bb10f4d2a7b21efa75d200e26
* Exclude singleton classes from `subclasses` and `descendants`Sean Griffin2016-12-012-0/+11
| | | | | | | | This behavior changed in Ruby starting with 2.3.0, as a result of https://bugs.ruby-lang.org/issues/11360. This results in a change in behavior of these methods which is likely undesirable. Fixes #27238
* Stop using the `pg` Float encoderSean Griffin2016-12-011-1/+0
| | | | | | | | | | PG's type map assumes that all Ruby floats are going to a field with an OID of type float4 or float8, and generates text which is invalid syntax for other types. Since the gem can handle floats properly without this encoder (albeit slightly slower), we can continue to use that as we have in prior versions of Rails. Fixes #27246
* Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245)David Heinemeier Hansson2016-12-018-12/+16
| | | Move node_modules, package.json, and yarn.lock file to vendor
* Merge pull request #27240 from nanaya/accidentally-headingMatthew Draper2016-12-011-2/+2
|\ | | | | Prevent issue number in documentation from becoming markdown header [ci skip]
| * Fix issue number from becoming markdown headernanaya2016-12-011-2/+2
|/ | | | The alternative is escaping it but moving around the text seems a bit simpler.
* Merge pull request #27233 from ↵Jon Moss2016-11-301-2/+0
|\ | | | | | | | | utilum/27202_remove_outdated_tip_in_form_helpers_guide Fixes #27202, [ci skip]
| * Fixes #27202, [ci skip]utilum2016-11-301-2/+0
|/
* Merge pull request #27206 from kirs/fix-testing-isolation-2Matthew Draper2016-12-011-7/+8
|\ | | | | Fix arguments passing in testing isolation
| * Fix arguments passing in testing isolationKir Shatrov2016-11-301-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue affects MRI 2.2.5, MRI 2.3.3, JRuby 9.1.6.0. It can be reproduced by: ``` $ cd activemodel $ NO_FORK=1 bundle exec rake test ``` If we wrap original arguments in quotes, it will be considered as a one big single argument. Later, [`rake/rake_test_loader.rb`](https://github.com/ruby/rake/blob/7863b97/lib/rake/rake_test_loader.rb#L15) will iterate over ARGS and try to require that huge single "argument" (which is a list of multiple .rb files). This leads to an exception: ``` /Users/kir/Project s/opensource/rails/vendor/bundle/gems/rake-11.3.0/lib/rake/rake_test_loader.rb:15:in `require': cannot load such file -- /Users/kir/Projects/opensource/rails/activemodel/test/cases/ attribute_assignment_test.rb [stripped] /Users/kir/Projects/opensource/rails/activemodel/test/cases/validations/with_validation_test.rb /Users/kir/Projects/opensource/rails/activemodel/test/cases/validations_test .rb (LoadError) from /Users/kir/Projects/opensource/rails/vendor/bundle/gems/rake-11.3.0/lib/rake/rake_test_loader.rb:15:in `block in <main>' from /Users/kir/Projects/opensource/rails/vendor/bundle/gems/rake-11.3.0/lib/rake/rake_test_loader.rb:4:in `select' from /Users/kir/Projects/opensource/rails/vendor/bundle/gems/rake-11.3.0/lib/rake/rake_test_loader.rb:4:in `<main>' ``` Originally quotes were introduced in https://github.com/rails/rails/pull/19819 to fix MRI 2.2.2. The fix solves issue on all affected platforms: MRI 2.2.5, MRI 2.3.3, JRuby 9.1.6.0.
* | Make the second argument to `attribute` optionalSean Griffin2016-11-303-1/+15
| | | | | | | | | | | | | | | | While working on updating Paper Trail for 5.1 compatibility, I noticed that I was required to pass a second argument to `attribute`. I didn't intend for this to be the case, as `attribute :foo` is totally reasonable shorthand for "I want `attr_accessor :foo`, but also have it work with things like `.attributes` and `ActiveRecord::Dirty`"
* | Correct deprecation warnings in `ActiveRecord::Dirty`Sean Griffin2016-11-301-6/+6
| | | | | | | | I had pointed the messages at the new behavior, not the old.
* | Merge pull request #27225 from y-yagi/make_windows_check_more_accurateRafael França2016-11-306-7/+7
|\ \ | | | | | | use `Gem.win_platform?` to check windows Ruby platforms
| * | use `Gem.win_platform?` to check windows Ruby platformsyuuji.yaginuma2016-11-306-7/+7
| | | | | | | | | | | | | | | `Gem.win_platform?` check if it is Windows more accurately. Ref: https://github.com/ruby/ruby/blob/ruby_2_2/lib/rubygems.rb#L945..L952
* | | Prevent race condition when launching EventMachine reactorMatthew Draper2016-11-302-2/+28
|/ / | | | | | | | | | | | | reactor_running? will be true just after the thread enters EventMachine.run; reactor_thread only gets set after the internal initialize_event_machine method has been called, the C extension is set up, and it is entering its run loop.
* | Avoid race condition in AJ integration testsMatthew Draper2016-11-302-1/+3
| | | | | | | | Make sure the file doesn't exist until we've finished writing it.
* | Merge pull request #27221 from phoet/current_is_not_usedMatthew Draper2016-11-301-1/+0
|\ \ | | | | | | removed `@current` as it is not used
| * | removed `@current` as it is not usedphoet2016-11-301-1/+0
| | |
* | | Merge pull request #27220 from mrreynolds/patch-1Kasper Timm Hansen2016-11-301-1/+1
|\ \ \ | |/ / |/| | fix typo in changelog
| * | fix typo in changelogRobert Glaser2016-11-301-1/+1
|/ /
* | Missing require 'active_support/notifications'Akira Matsuda2016-11-301-0/+1
| |
* | Merge pull request #27217 from roryokane/patch-1Rafael França2016-11-291-1/+1
|\ \ | | | | | | Fix typo in Rails 5.0 release notes – “when when”
| * | Fix typo in Rails 5.0 release notes – “when when”Rory O’Kane2016-11-291-1/+1
|/ / | | | | [ci skip]
* | Merge pull request #27212 from dcarral/docs-action-on-unpermitted-parameters ↵Sean Griffin2016-11-291-2/+2
|\ \ | | | | | | | | | | | | [ci skip] Explicitly document 'false' as value for 'action_on_unpermitted_parameters'
| * | Document 'false' as option for 'action_on_unpermitted_parameters'Daniel Carral2016-11-291-2/+2
| | | | | | | | | | | | [ci skip]
* | | Treat combined durations as a single unitSean Griffin2016-11-292-3/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, `3.months - 3.months` would result in a duration that has the "parts" of `[[:months, 3], [:months, -3]]`. This would mean that it was subtly different than `2.months - 2.months`. When applied to a time, the date might actually change if the resulting day doesn't exist however many months in the future, even though in both cases we just wanted to add `0`, which should always be an identity operation. With this change, we now store the parts as a hash, so `3.months - 3.months` is simply stored as `{ months: 0 }`.
* | Merge pull request #27126 from kamipo/fix_unsigned_with_zerofillRafael França2016-11-294-2/+9
|\ \ | | | | | | Fix that unsigned with zerofill is treated as signed
| * | Fix that unsigned with zerofill is treated as signedRyuta Kamizono2016-11-274-2/+9
| | | | | | | | | | | | Fixes #27125.
* | | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
| | |