aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29963 from y-yagi/fix_ruby_warningsKasper Timm Hansen2017-07-301-3/+3
|\ | | | | Fix `warning: method redefined;`
| * Fix `warning: method redefined;`yuuji.yaginuma2017-07-281-3/+3
| | | | | | | | | | | | | | | | | | This fixes the following warning: ``` /tmp/d20170727-7039-kmdtb1/app/app/models/user.rb:5: warning: method redefined; discarding old model_name rails/activemodel/lib/active_model/naming.rb:222: warning: previous definition of model_name was here ```
* | Merge pull request #30002 from y-yagi/change_http_postgresql_links_to_httpsVipul A M2017-07-308-32/+32
|\ \ | | | | | | Change http postgresql.org links to https [ci skip]
| * | Change http postgresql.org links to https [ci skip]yuuji.yaginuma2017-07-308-32/+32
|/ / | | | | | | | | It seems that it accepts only HTTPS connections. Ref: https://github.com/postgres/postgres/commit/7f77cbd996855a06fb742ea11adbe55c42b48fe2
* | Merge pull request #29933 from kirs/frozen-actionpackMatthew Draper2017-07-29281-3/+563
|\ \ | | | | | | Use frozen string literal in actionpack/
| * | Use frozen string literal in actionpack/Kir Shatrov2017-07-29281-3/+563
|/ /
* | Merge pull request #29946 from kamipo/passing_arel_to_where_is_boundableSean Griffin2017-07-281-4/+1
|\ \ | | | | | | Building `where_clause` in `UniquenessValidator` is no longer needed
| * | Building `where_clause` in `UniquenessValidator` is no longer neededRyuta Kamizono2017-07-261-4/+1
| | | | | | | | | | | | | | | | | | Building `where_clause` manually was introduced at #26073 to include both `comparison` and `binds` in `where_clause`. Since 213796f, `comparison` includes `binds`, so it is enough to use `where` simply.
* | | Merge pull request #29979 from kamipo/use_build_bind_attributeSean Griffin2017-07-284-8/+7
|\ \ \ | | | | | | | | Use `predicate_builder.build_bind_attribute` wherever possible
| * | | Use `predicate_builder.build_bind_attribute` wherever possibleRyuta Kamizono2017-07-284-8/+7
| | | | | | | | | | | | | | | | For less duplicated code.
* | | | Add missing support for modulo operations on durationsSayan Chakraborty2017-07-283-14/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5.1 introduce an `ActiveSupport::Duration::Scalar` class as a wrapper around a numeric value as a way of ensuring a duration was the outcome of an expression. However the implementation was missing support for modulo operations. This commit adds support for those operations and should result in a duration being returned from expressions involving them. Fixes #29603 and #29743.
* | | | Merge pull request #29982 from ydakuka/patch-1Robin Dupret2017-07-281-3/+3
|\ \ \ \ | | | | | | | | | | [ci skip] update routing guide
| * | | | Squashed commit of the following:ydakuka2017-07-281-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4a3d295f3011e771cddead80de7497ca15d15c13 Author: Yauheni Dakuka <yauheni.dakuka@gmail.com> Date: Fri Jul 28 14:31:35 2017 +0300 Update routing.md commit 620a4ce47288e3ef6504290c78f931214968e7e3 Author: Yauheni Dakuka <yauheni.dakuka@gmail.com> Date: Fri Jul 28 14:19:29 2017 +0300 [ci skip] update routing guide
* | | | Merge pull request #29980 from ydakuka/patch-1Robin Dupret2017-07-281-1/+1
|\ \ \ \ | |/ / / |/| | | [ci skip] update routing guide
| * | | [ci skip] update routing guideYauheni Dakuka2017-07-281-1/+1
|/ / /
* | | Eager load the association classes on bootRafael Mendonça França2017-07-271-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were expecting those classes to be loaded when an association is defined but they are not. If you add a debugger on the first line of any of those classes and try to define the corresponding association you will see that the classes are not loaded. Fixes #26273
* | | Merge pull request #29971 from rails/fix-duration-divisionAndrew White2017-07-273-15/+28
|\ \ \ | | | | | | | | Fix division where a duration is the denominator
| * | | Fix division where a duration is the denominatorAndrew White2017-07-273-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #29163 introduced a change in behavior when a duration was the denominator in a calculation - this was incorrect as dividing by a duration should always return a `Numeric`. The behavior of previous versions of Rails has been restored. Fixes #29592.
* | | | Merge pull request #28695 from koic/integer_type_has_precision_option_in_oracleAkira Matsuda2017-07-271-1/+5
|\ \ \ \ | |/ / / |/| | | Fix an AR test of schema dump when using Oracle
| * | | Fix an AR test of schema dump when using OracleKoichi ITO2017-04-071-1/+5
| | | |
* | | | Merge pull request #29959 from kaanklky/masterRafael França2017-07-261-0/+4
|\ \ \ \ | | | | | | | | | | Fix search input's type & placeholder conflict in Routing Error page
| * | | | Fix search input's type & placeholder conflict in Routing Error pageKaan Kölköy2017-07-261-0/+4
| | |_|/ | |/| |
* / | | Use `_relation_for_itself` wherever possibleSean Griffin2017-07-261-3/+2
|/ / / | | | | | | | | | | | | | | | | | | Anywhere that we're doing `self.class.unscoped.where(primary_key => id)` is somewhere that someone may want to extend. Even if this method isn't public API yet, this will make it easier for us to eventually expose an API around this. Plus, duplicated code makes me sad.
* | | Use exact Rails version when verifying.Kasper Timm Hansen2017-07-251-1/+6
| | |
* | | Require arel master in the benchmark templateSean Griffin2017-07-251-0/+1
| |/ |/| | | | | Pointing at Rails master generally requires pointing at Arel master
* | Merge pull request #29941 from kamipo/remove_single_element_array_preprocessSean Griffin2017-07-252-2/+2
|\ \ | | | | | | Remove single element array preprocess
| * | Remove single element array preprocessRyuta Kamizono2017-07-262-2/+2
| | | | | | | | | | | | | | | Since 213796f, array predicate handler supports making binds, so the preprocess is no longer needed.
* | | Merge pull request #29942 from lugray/doc_clarification [ci skip]Sean Griffin2017-07-251-0/+1
|\ \ \ | | | | | | | | Clarify add_column limit documentation
| * | | Clarify add_column limit documentationLisa Ugray2017-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | The limit option is ignored by PostgreSQL and may be ignored by 3rd party backends. Make this clear in the docs. Fixes #29922.
* | | | Merge pull request #29926 from pawandubey:fix-test-with-absolute-pathsKasper Timm Hansen2017-07-252-1/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Allow bin/rails test task to take absolute paths as argumentsPawan Dubey2017-07-252-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solves #29923 This regression was caused due to a wrong regex to filter out paths, introduced in commit 796a1cf0e The regex was /^\w+\// which did not accept paths with a leading slash and hence all absolute paths were filtered out. This change introduces a change in regex which allows for a leading slash and acts on the matched term accordingly. While cascading through the case block, the paths are checked for line number specification, existence of a directory at that path and if none of those match, then it is considered to be a path to the file. The regex matchers specified are filtered out via the call to `Array#compact` since they do not match any of these conditions.
* | | | Allow `Relation#or` to accept a relation with different `references`Sean Griffin2017-07-253-1/+20
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Note that the two relations must still have the same `includes` values (which is the only time `references` actually does anything). It makes sense for us to allow this, as `references` is called implicitly when passing a hash to `where`. Fixes #29411
* | | Merge pull request #29940 from kamipo/update_gemfile_lockSean Griffin2017-07-251-3/+3
|\ \ \ | | | | | | | | Update Gemfile.lock to reflect arel 9.0.0.alpha
| * | | Update Gemfile.lock to reflect arel 9.0.0.alphaRyuta Kamizono2017-07-261-3/+3
| | | | | | | | | | | | | | | | Follow up to 089ca52.
* | | | Merge pull request #29932 from koic/supress_deprecated_warning_in_actioncableSean Griffin2017-07-251-1/+1
|\ \ \ \ | |/ / / |/| | | Suppress deprecated warning in Action Cable
| * | | Suppress deprecated warning in Action CableKoichi ITO2017-07-251-1/+1
| | | |
* | | | Require alpha arelSean Griffin2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, bundler will resolve a gemfile which is pointing at Rails master and not arel master. The error message that someone will get from doing this will be incredibly unhelpful, as it'll be the result of ActiveRecord being in a half-loaded that halted at `require "arel/collectors/composite"`, which was subsequently rescued in `"rails/all"`
* | | | Merge pull request #29934 from kamipo/remove_join_informationSean Griffin2017-07-253-10/+5
|\ \ \ \ | | | | | | | | | | Remove useless `JoinInformation`
| * | | | Remove useless `JoinInformation`Ryuta Kamizono2017-07-253-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Since 213796f removed `binds`, `JoinInformation` only contain `joins`. So it is enough to return `joins` simply.
* | | | | Merge pull request #29935 from kamipo/remove_unused_queries_predicatesSean Griffin2017-07-251-12/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused `queries_predicates`
| * | | | | Remove unused `queries_predicates`Ryuta Kamizono2017-07-251-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since 213796f, `queries_predicates` is no longer used.
* | | | | | Merge pull request #29931 from ↵Sean Griffin2017-07-254-65/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | y-yagi/extract_assert_output_and_available_pty_to_module Extract `assert_output` and `available_pty?` into `ConsoleHelpers` module
| * | | | | Extract `assert_output` and `available_pty?` into `ConsoleHelpers` moduleyuuji.yaginuma2017-07-254-65/+36
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | We define almost the same method with multiple tests. Therefore, it extract into module.
* | | | | Fix failing testsSean Griffin2017-07-252-2/+2
| | | | | | | | | | | | | | | | | | | | `bind_values` was removed from Arel
* | | | | Fix `dbconsole` test when tempdir is a long pathSean Griffin2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of `.databases` in SQLite will truncate to a certain size. This causes the test to fail when run locally from a mac, or anything which has a tempdir with more than a few characters. This pragma has the same output, but presented as a normal query, meaning no truncation will occur.
* | | | | Merge pull request #29928 from ↵Eileen M. Uchitelle2017-07-251-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | koic/fix_test_add_column_with_timestamp_type_oracle Fix `test_add_column_with_timestamp_type` when using Oracle
| * | | | | Fix `test_add_column_with_timestamp_type` when using OracleKoichi ITO2017-07-251-0/+2
| |/ / / /
* | | | | Merge pull request #29916 from lugray/stop_generating_application_recordEileen M. Uchitelle2017-07-2510-57/+66
|\ \ \ \ \ | |_|/ / / |/| | | | Stop creating ApplicationRecord on model generation
| * | | | Stop creating ApplicationRecord on model generationLisa Ugray2017-07-2410-57/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating models, we created ApplicationRecord in the default location if no file existed there. That was annoying for people who moved it to somewhere else in the autoload path. At this point, the vast majority of apps should have either run the upgrade script or generated a model since upgrading. For those that haven't the error message after generating a new model should be helpful: NameError: uninitialized constant ApplicationRecord To ease friction in that case, this also adds a generator for ApplicationRecord.
* | | | | Merge pull request #29930 from JagdeepSingh/add-callbacks-documentationप्रथमेश Sonpatki2017-07-251-0/+29
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip] Add documentation for after_create_commit and after_update_commit callbacks
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 09:30:21 +0000