aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25908 from mechanicles/derives-fromKasper Timm Hansen2016-07-232-8/+8
|\ | | | | Explain meaning of the code very well and Remove confusion. [ci skip]
| * Explain meaning of the code very well and Remove confusion. [ci skip]Santosh Wadghule2016-07-232-8/+8
| | | | | | | | | | | | Code like `render(topics) => render("topics/topic")` adds confusion for the readers. On first impression, that code feels like hash kind of data, but it's not. So make it more clear and meaningful.
* | Merge pull request #25914 from jmccartie/jm/not_inRafael França2016-07-224-0/+81
|\ \ | | | | | | Adds `not_in?` onto Object
| * | Adds `not_in?` onto ObjectJon McCartie2016-07-214-0/+81
| | |
* | | revises a regexpXavier Noria2016-07-221-1/+1
| | | | | | | | | | | | The exclamation mark is not a metacharacter.
* | | systematic revision of =~ usage in ASXavier Noria2016-07-2217-29/+43
| | | | | | | | | | | | | | | Where appropriate prefer the more concise Regexp#match?, String#include?, String#start_with?, and String#end_with?
* | | adds require for Regexp#match?Xavier Noria2016-07-221-0/+2
| | |
* | | revises styleXavier Noria2016-07-221-1/+1
| | |
* | | the infamous typo only seen in GitHub's diff [ci skip]Xavier Noria2016-07-221-1/+1
|/ /
* | performance boost for String#blank? in Ruby 2.4Xavier Noria2016-07-221-1/+1
| | | | | | | | | | | | Some casual benchmarks showed a 2x factor. All credit goes to @nurse.
* | define Range#match? if Ruby < 2.4Xavier Noria2016-07-224-2/+54
| | | | | | | | | | | | See the rationale in the documentation included in this patch. We are going to gradually introduce this predicate in the code base.
* | Allow MessageEncryptor to take advantage of authenticated encryption modesBart de Water2016-07-213-4/+64
| | | | | | | | | | | | AEAD modes like `aes-256-gcm` provide both confidentiality and data authenticity, eliminating the need to use MessageVerifier to check if the encrypted data has been tampered with. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | Merge pull request #25911 from juno/fix-comment-indentXavier Noria2016-07-211-3/+3
|\ \ | | | | | | Fix incorrect indentation in method comment
| * | Fix incorrect indentation in method comment [ci skip]Junya Ogura2016-07-211-3/+3
|/ /
* | explain the meaning of some RuboCop config options [ci skip]Xavier Noria2016-07-211-0/+8
| | | | | | | | | | | | | | | | For consistency mainly. Also, some have a name that could make the reader think they enforce the opposite of what they do, because the default is not visible there.
* | Merge pull request #25907 from gsamokovarov/lock-web-console-for-5.0Yves Senn2016-07-212-3/+3
|\ \ | |/ |/| Enforce minimal web-console version for Rails 5
| * Enforce minimal web-console version for Rails 5Genadi Samokovarov2016-07-212-3/+3
|/ | | | | | | | | | | | | | | I dropped the version constraint in web-console with the idea it will be easier to upgrade the console between Rails releases. However, issues like #25899 started popping up. I'm reintroducing the constraint, but this time, I don't set an upper limit to the major version. This will keep the web-console in a version that always works for the current Rails version and can be easily upgraded to the last one with `bundle update`. We may need to backport this for Rails 5.0.1. Fixes #25899.
* Merge pull request #25616 from ignatiusreza/callable_cache_keyKasper Timm Hansen2016-07-213-5/+30
|\ | | | | Bring back support for callable cache key when rendering collection
| * Bring back support for callable cache_key on collection renderingIgnatius Reza2016-07-213-5/+30
|/
* Merge pull request #25902 from etiennebarrie/remove-tabs-before-commandsRafael França2016-07-201-4/+4
|\ | | | | Remove tab chars before commands to be run
| * Remove tab chars before commands to be runÉtienne Barrié2016-07-201-4/+4
|/
* Merge pull request #25885 from kamipo/fix_explain_logging_with_bindsRafael França2016-07-204-17/+28
|\ | | | | Fix explain logging with binds
| * Fix explain logging with bindsRyuta Kamizono2016-07-204-17/+28
| | | | | | | | `binds` is an array of a query attribute since Active Record 5.0.
* | Merge pull request #25786 from ↵Rafael França2016-07-202-5/+21
|\ \ | | | | | | | | | | | | kamipo/add_exists_and_update_all_to_collection_proxy Add `exists?` and `update_all` to `CollectionProxy` for respects an association scope
| * | Add `exists?` and `update_all` to `CollectionProxy` for respects an ↵Ryuta Kamizono2016-07-202-5/+21
| |/ | | | | | | | | | | association scope Fixes #25732.
* | Merge pull request #25897 from ↵Rafael França2016-07-202-14/+1
|\ \ | |/ |/| | | | | yahonda/remove_set_date_columns_and_modify_attributes_test Remove Oracle specific tests based on deprecated behaviors
| * Oracle TIMESTAMP sql type is associated with Rails `DateTime` type nowYasuo Honda2016-07-202-14/+1
| | | | | | | | | | | | - Refer https://github.com/rsim/oracle-enhanced/pull/845 Remove `set_date_columns` which has been deprecated in Oracle enhanced adapter - Refer https://github.com/rsim/oracle-enhanced/pull/869
* | Merge pull request #25438 from prathamesh-sonpatki/rm-session-store-initializerRafael Mendonça França2016-07-2010-29/+49
|\ \ | | | | | | | | | Setup default session store internally, no longer through an initializer
| * | Setup default session store internally, no longer through an application ↵Prathamesh Sonpatki2016-07-1710-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initializer - By default the session store will be set to cookie store with application name as session key. - Older apps are not affected as they will have the session store initializer generated by Rails in older versions, and Rails will not overwrite the session store if it is already set or disabled. - But new apps will not have the initializer, instead the session store will be set to cookie store by default. - Based on comment by DHH here - https://github.com/rails/rails/issues/25181#issuecomment-222312764.
| * | Refactor the existing session_store to use keyword args and raise early when ↵Prathamesh Sonpatki2016-07-171-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to activerecord session store - Use keyword args as it is possible to use them now. - The error message for activerecord-session_store gem was added in 1807384. - But it was added for a code path which gets called when we try to **access** the session store, not when we **set** it. - So the test expecting the exception started failing because now the session store is set via railtie again **after** setting it first with :active_record_store in the test. - As the error is not raised while setting the store to :active_record_store, the store gets overwritten by railtie and when we access it via `session_store` while building the default middleware stack, the exception is not raised. - This commit moves the code for raising the exception to the path where we try to set the store.
| * | Introduce a new method for checking whether session_store is set by user or ↵Prathamesh Sonpatki2016-07-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by Rails - We need to ability to check whether the session store it is set or not so that we can set it ourselves in an internal initializer. - We can't rely on return value of `config.session_store` as it can return `nil` when set to `disabled` and we will accidentally override it and set to default cookie store. - So introduced new method which just tells us whether it is set or not.
* | | Merge pull request #25578 from ↵Rafael França2016-07-207-20/+39
|\ \ \ | | | | | | | | | | | | | | | | kamipo/move_warning_about_composite_primary_key_to_attribute_methods_primary_key Move the warning about composite primary key to `AttributeMethods::PrimaryKey`
| * | | Move the warning about composite primary key to `AttributeMethods::PrimaryKey`Ryuta Kamizono2016-07-027-20/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually schema dumper/creation supports composite primary key (#21614). Therefore it should not show the warning about composite primary key in connection adapter. This change moves the warning to `AttributeMethods::PrimaryKey` and suppress the warning for habtm join table. Fixes #25388.
* | | | Merge pull request #25520 from st0012/fix-current-pageRafael França2016-07-202-0/+8
|\ \ \ \ | | | | | | | | | | Fix ActionView::Helpers#current_page? with trailing space issue.
| * | | | Fix ActionView::Helpers#current_page? with issue in ↵Stan Lo2016-07-202-0/+8
| | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/19472
* | | | | Merge pull request #25889 from kamipo/do_not_dup_binds_in_to_sqlRafael França2016-07-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Do not `binds.dup` in `connection#to_sql`
| * | | | | Do not `binds.dup` in `connection#to_sql`Ryuta Kamizono2016-07-191-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Because `connection#to_sql` does not mutate `binds`.
* | | | | Merge pull request #25888 from kamipo/use_conn_to_sql_for_construct_sqlRafael França2016-07-201-10/+5
|\ \ \ \ \ | | | | | | | | | | | | Use `connection#to_sql` for construct an SQL
| * | | | | Use `connection#to_sql` for construct an SQLRyuta Kamizono2016-07-191-10/+5
| |/ / / /
* | | | | Merge pull request #25823 from mechanicles/missing-memory-store-testsRafael França2016-07-201-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Add missing tests for memory store of cache.
| * | | | | Add missing tests for memory store of cache.Santosh Wadghule2016-07-171-0/+10
| | | | | |
* | | | | | Merge pull request #25849 from suginoy/fix_merge_in_scopeRafael Mendonça França2016-07-203-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix the calling `merge` method at first in a scope
| * | | | | | Fix the calling `merge` method at first in a scopesuginoy2016-07-193-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the order of method chaining `merge` and other query method such as `joins` should produce the same result. ```ruby class Topic < ApplicationRecord scope :safe_chaininig, -> { joins(:comments).merge(Comment.newest) } scope :unsafe_chaininig, -> { merge(Comment.newest).joins(:comments) } #=> NoMethodError end ```
* | | | | | | Merge pull request #25828 from bogdanvlviv/ref_default_sequence_nameRafael França2016-07-202-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactored method `ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements#default_sequence_name`. Refactored test `HasManyAssociationsTest#test_do_not_call_callbacks_for_delete_all`.
| * | | | | | | Refactored test ↵bogdanvlviv2016-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `HasManyAssociationsTest#test_do_not_call_callbacks_for_delete_all`
| * | | | | | | Refactored method ↵bogdanvlviv2016-07-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements#default_sequence_name`
* | | | | | | | Merge pull request #25393 from gsamokovarov/introduce-assert-changesRafael França2016-07-203-9/+236
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Introduce `assert_changes` and `assert_no_changes`
| * | | | | | | | Introduce `assert_changes` and `assert_no_changes`Genadi Samokovarov2016-07-173-9/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those are assertions that I really do miss from the standard `ActiveSupport::TestCase`. Think of those as a more general version of `assert_difference` and `assert_no_difference` (those can be implemented by assert_changes, should this change be accepted). Why do we need those? They are useful when you want to check a side-effect of an operation. `assert_difference` do cover a really common case, but we `assert_changes` gives us more control. Having a global error flag? You can test it easily with `assert_changes`. In fact, you can be really specific about the initial state and the terminal one. ```ruby error = Error.new(:bad) assert_changes -> { Error.current }, from: nil, to: error do expected_bad_operation end ``` `assert_changes` follows `assert_difference` and a string can be given for evaluation as well. ```ruby error = Error.new(:bad) assert_changes 'Error.current', from: nil, to: error do expected_bad_operation end ``` Check out the test cases if you wanna see more examples. :beers:
* | | | | | | | | Merge pull request #25834 from ↵Rafael França2016-07-203-1/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alpaca-tc/fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes Fix bug in method AR TimeZoneConverter#set_time_zone_without_conversion
| * | | | | | | | | Fixes multiparameter attributes conversion with time_zone_aware_attributes ↵alpaca-tc2016-07-193-1/+19
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | and invalid params
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 23:49:10 +0000