aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31293 from ydakuka/fix-gemfile-guidesYuji Yaginuma2017-12-0111-28/+28
|\ | | | | Cosmetic changes for Gemfile [ci skip]
| * Cosmetic changes [ci skip]Yauheni Dakuka2017-11-3011-28/+28
| |
* | Merge pull request #31296 from dixitp012/configuration_update_linksRyuta Kamizono2017-12-011-3/+3
|\ \ | | | | | | [ci skip] Updated links for unicorn which redirect & added https for n…
| * | [ci skip] Updated links for uncorn which redirect & added https for nginx linkDixit Patel2017-11-301-3/+3
| |/
* | Merge pull request #31292 from noahd1/patch-1Rafael França2017-11-301-0/+22
|\ \ | | | | | | Keep current Code Climate behavior before upgrade
| * | Keep current Code Climate behavior before upgradeNoah Davis2017-11-291-0/+22
| |/ | | | | | | | | | | | | | | | | If you merge these changes now (*before Monday, December 4th*), Code Climate will run the same analysis on Rails as it always has on your pull requests. *If you do not merge these changes*, when Code Climate migrates Rails to our new analysis, Code Climate will continue to run Rubocop, but it will ALSO run Code Climate's new maintainability checks (https://codeclimate.com/blog/10-point-technical-debt-assessment). You may want this ... you may not. Just want to make sure you knew the quick option to disable them if it's a problem!
* | Add changelog entry for 9d6e28eileencodes2017-11-301-0/+12
| | | | | | | | Since this changes a default setting a changelog entry is important.
* | Merge pull request #31300 from aried3r/ar/move_test_dependencies_to_test_groupEileen M. Uchitelle2017-11-301-7/+10
|\ \ | |/ |/| Move system test dependencies to test group
| * Move system test dependencies to test groupAnton Rieder2017-11-301-7/+10
|/
* Do not overwrite by default if credentials already existsyuuji.yaginuma2017-11-302-2/+12
| | | | Fixes #31286
* Add :nodoc: to `StatementPool` which is internal used [ci skip]Ryuta Kamizono2017-11-302-4/+2
| | | | | | In #30510, `StatementPool` in `AbstractMysqlAdapter` was hidden in the doc. But that class is also had in sqlite3 and postgresql adapters and the base class is :nodoc: class.
* Build the root folder before specific filesRafael Mendonça França2017-11-291-8/+8
| | | | Fixes #31282.
* Make screenshots default to "simple" formateileencodes2017-11-292-10/+13
| | | | | | | | | Not everyone uses iTerm2 and whereas Terminal.app on a mac just ignores that and outputs the path, other terminals like those on Ubuntu do not. A friendlier default is one that works by default. Closes #31159 Closes #30957
* Merge pull request #31214 from ↵Eileen M. Uchitelle2017-11-293-0/+17
|\ | | | | | | | | chopraanmol1/bug_fix_has_one_inverse_owner_reload_from_validation Inverse instance should not be reloaded during autosave if called in validation
| * Inverse instance should not be reloaded during autosave if called in validationAnmol Chopra2017-11-273-0/+17
| | | | | | | | | | Record saved in save_has_one_association already make call to association.loaded! via record's before_save callback of save_belongs_to_association, but this will reload object if accessed in record's validation.
* | Merge pull request #31272 from y-yagi/use_credentials_instead_of_keyfile_in_gcsGeorge Claghorn2017-11-295-21/+23
|\ \ | | | | | | Use `credentials` instead of `keyfile` in GCS sevice
| * | Use `credentials` instead of `keyfile` in GCS seviceyuuji.yaginuma2017-11-295-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `keyfile` was renamed to `credentials` in `google-cloud-storage` 1.8.0. https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/google-cloud-storage/CHANGELOG.md#180--2017-11-14 Although `keyfile` can still be used, but it looks like deprecate. https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/ddf7b2a856d676316525eb581c1a4cc83ca6097b/google-cloud-storage/lib/google/cloud/storage.rb#L589...L590 Therefore, I think that should use `credentials` in newly generated applications. Ref: https://github.com/GoogleCloudPlatform/google-cloud-ruby/issues/1802
* | | Mention about Ruby 2.4 Unicode case mappings in `mb_chars` example [ci skip] ↵Ryuta Kamizono2017-11-291-1/+3
| | | | | | | | | | | | | | | (#31275) https://www.ruby-lang.org/en/news/2016/09/08/ruby-2-4-0-preview2-released/
* | | Fix tests: Remove ogx mime type from testsGuillermo Iguaran2017-11-291-1/+1
| | |
* | | Fix typo in mime type registeringGuillermo Iguaran2017-11-291-1/+1
| | |
* | | Restore mpeg mime type, delete less common mime typesGuillermo Iguaran2017-11-291-9/+4
| | | | | | | | | | | | See discussion in #31251
* | | Register "audio/mp4" mime type with :m4a symbolGuillermo Iguaran2017-11-291-1/+1
| | |
* | | Merge pull request #31274 from dixitp012/correct_output_for_upcaseRyuta Kamizono2017-11-291-1/+1
|\ \ \ | | | | | | | | [ci skip] Correct output for Upcase
| * | | [ci skip] Correct output for UpcaseDixit Patel2017-11-291-1/+1
| | | |
* | | | Merge pull request #31251 from rails/preload_link_tagGuillermo Iguaran2017-11-297-8/+128
|\ \ \ \ | |/ / / |/| | | Add preload_link_tag helper.
| * | | Update send_file headers test to use mp4 as example instead of mpgGuillermo Iguaran2017-11-281-1/+1
| | | |
| * | | Register most popular audio/video/font mime types supported by modern browsersGuillermo Iguaran2017-11-283-7/+29
| | | |
| * | | Add preload_link_tag helper.Guillermo Iguaran2017-11-283-0/+98
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper creates a link tag with preload keyword that allows to browser to initiate early fetch of resources. Additionally this send Early Hints if supported. See https://github.com/rails/rails/pull/30744/commits/59a02fb7bcbe68f26e1e7fdcec45c00c66e4a065 for more details about Early Hints. Preload spec: https://w3c.github.io/preload/
* | | Merge pull request #31268 from tjschuck/refactor_prev_next_occurringRafael França2017-11-283-26/+32
|\ \ \ | |/ / |/| | Refactor Date/Time next_occurring and prev_occurring
| * | Refactor Date/Time next_occurring and prev_occurringT.J. Schuck2017-11-283-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods were originally added in https://github.com/rails/rails/pull/26600 This includes a couple of refactors to make these methods behave more similarly to other Date/Time extensions added by Active Support: 1. Use `advance` instead of `since` and `ago` to time-travel — this is particularly important to keep the returned instance’s class matching `self`. Before this change: today = Date.today # => Tue, 28 Nov 2017 today.class # => Date today.next_occurring(:wednesday) # => Wed, 29 Nov 2017 00:00:00 UTC +00:00 today.next_occurring(:wednesday).class # => ActiveSupport::TimeWithZone After this change, a Date (or Time, or DateTime) instance is properly returned (just like is shown in the new docs). This is generally how everything else in DateAndTime::Calculations works. 2. Move the tests from the DateTime tests to the DateAndTimeBehavior tests. The latter location is mixed in to the core_ext tests for _all_ of Date, Time, and DateTime to test the behavior across all of the classes. The previous location is for testing core_ext functionality added specifically just to DateTime. 3. Better docs!
* | | Merge pull request #31270 from tjschuck/deprecation_example_code_formattingYuji Yaginuma2017-11-292-2/+2
|\ \ \ | |/ / |/| | Formatting fix for example code
| * | Formatting fix for example codeT.J. Schuck2017-11-282-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just cleaning up the formatting of the example code here to format an inline bit of commentary as a comment. Before: ![](https://monosnap.com/file/Clso8IQGOWHU3o6cStbY5NaMPx3ysP.png) After: ![](https://monosnap.com/file/QdbKKvLAeiQ0RucppVYETvaWEstnOI.png) [ci skip]
* | Merge pull request #31179 from kinnrot/scoping-reserved-namesRafael Mendonça França2017-11-285-0/+49
|\ \ | | | | | | | | | Scoping reserved names
| * | Prevent scope named same as a ActiveRecord::Relation instance method.Chen Kinnrot2017-11-285-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | Due to inconsistent behavior when chaining scopes and one scope named after a Relation method Validation code added in 2 places: - scope, to prevent problematic scope names. - enum, cause it tries to auto define scope.
* | | Merge pull request #31254 from suginoy/update_doc_find_orderRafael França2017-11-281-3/+4
|\ \ \ | | | | | | | | [ci skip]Update docs `ActiveRecord::FinderMethods#find`
| * | | Update docs `ActiveRecord::FinderMethods#find`suginoy2017-11-281-3/+4
| | | | | | | | | | | | | | | | ref https://github.com/rails/rails/pull/22653
* | | | Make sure the request exist befoe trying to send early hintsRafael Mendonça França2017-11-282-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Action Mailer context for example responds to request but don't have a a request object. Fixes #31265
* | | | Preparing for 5.2.0.beta2 releaseRafael Mendonça França2017-11-2827-51/+108
| | | |
* | | | Merge pull request #31264 from fatosmorina/fix_typosRafael França2017-11-2813-27/+41
|\ \ \ \ | | | | | | | | | | Fix typos and add a few suggestions
| * | | | Fix typos and add a few suggestionsFatos Morina2017-11-2813-27/+41
|/ / / /
* | | | Merge pull request #31261 from ↵Andrew White2017-11-283-0/+54
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | rails/fix-relative-url-root-with-optimized-url-helpers Fix optimized url helpers when using relative url root
| * | | Fix optimized url helpers when using relative url rootAndrew White2017-11-283-0/+54
| |/ / | | | | | | | | | Fixes #31220.
* | | Merge pull request #31255 from dixitp012/update_action_controller_guideRyuta Kamizono2017-11-281-1/+1
|\ \ \ | |/ / |/| | [ci skip] Update MVC wiki link
| * | [ci skip] Update MVC wiki linkDixit Patel2017-11-281-1/+1
|/ /
* | Use same version constraint in mysql adapter and generated applicationyuuji.yaginuma2017-11-282-2/+2
| | | | | | | | Follow up of 924a368f5c654f5304e575c767eb0fc64adc8659
* | Merge pull request #31248 from y-yagi/fix_31245Rafael França2017-11-271-1/+1
|\ \ | | | | | | Include migration files in gem
| * | Include migration files in gemyuuji.yaginuma2017-11-281-1/+1
| | | | | | | | | | | | Fixes #31245
* | | Change how `AttributeSet::Builder` receives its defaultsSean Griffin2017-11-274-20/+21
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two concerns which are both being combined into one here, but both have the same goal. There are certain attributes which we want to always consider initialized. Previously, they were handled separately. The primary key (which is assumed to be backed by a database column) needs to be initialized, because there is a ton of code in Active Record that assumes `foo.id` will never raise. Additionally, we want attributes which aren't backed by a database column to always be initialized, since we would never receive a database value for them. Ultimately these two concerns can be combined into one. The old implementation hid a lot of inherent complexity, and is hard to optimize from the outside. We can simplify things significantly by just passing in a hash. This has slightly different semantics from the old behavior, in that `Foo.select(:bar).first.id` will return the default value for the primary key, rather than `nil` unconditionally -- however, the default value is always `nil` in practice.
* | Drop mysql2 version less than 0.4.3 to guarantee fork safety (#31244)Ryuta Kamizono2017-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #31173, mysql2 adapter depends on `automatic_close` which is introduced since mysql2 0.4.3. So the adapter with the mysql2 version before doesn't work with fork now. ``` % ARCONN=mysql2 be ruby -w -Itest test/cases/connection_adapters/connection_handler_test.rb -n test_forked_child_doesnt_mangle_parent_connection Using mysql2 Run options: -n test_forked_child_doesnt_mangle_parent_connection --seed 19988 /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:108:in `discard!': undefined method `automatic_close=' for #<Mysql2::Client:0x00007fedaa91dfd0> (NoMethodError) ``` This drops mysql2 version less than 0.4.3 to guarantee fork safety.
* | Merge pull request #31243 from ignat-z/patch-1Rafael França2017-11-271-8/+6
|\ \ | | | | | | [ci skip] Fix documentation for deprecation method_wrappers