aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22874 from ↵Rafael França2016-01-012-0/+0
|\ | | | | | | | | prathamesh-sonpatki/create-application-model-under-namespaced-dir-in-plugin Create application_record.rb under namespaced directory in plugin
| * Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
| | | | | | | | | | | | - Earlier it was creating application_record.rb under `app/models`, after this change, it will create application_record.rb under `app/models/plugin_name` similar to other application classes.
* | quoted_id is not public API.Rafael Mendonça França2016-01-011-1/+1
| | | | | | | | | | It was made public by mistake in https://github.com/rails/rails/commit/539b69e0.
* | Merge pull request #22883 from mtsmfm/remove-unnecessary-enable_extensionRafael França2016-01-012-11/+0
|\ \ | | | | | | Remove unnecessary enable,disable_extension on tests
| * | Remove unnecessary enable,disable_extension on testsFumiaki MATSUSHIMA2016-01-022-11/+0
|/ / | | | | | | | | | | | | uuid-ossp extension is alreadly enabled on test schema. And `disable_extension!('uuid-ossp', connection)` can be a cause of test failure. `ActiveRecord::StatementInvalid: PG::UndefinedFunction: ERROR: function uuid_generate_v1() does not exist` will happen depending on the execution order.
* | Merge pull request #22860 from Timmehs/better-or-exampleClaudio B2016-01-011-2/+2
|\ \ | | | | | | Better example for ActiveRecord::Relation#or [ci skip]
| * | Improve example of #or to use different column values in the where clausesTim Sandberg2015-12-301-2/+2
| | |
* | | Merge pull request #22881 from ↵Sean Griffin2015-12-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | iguchi1124/fix-to-remove-wasted-space-in-cable-coffee Remove a wasted space [ci skip]
| * | | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
|/ / /
* | | value has the right type hereSantiago Pastorino2015-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using `enum kind: [ :any, :income, :expense ]` syntax, value is already an integer and using `enum kind: { any: 'any', income: 'income', expense: 'expense' }` syntax value is a string. This allows us to define the mapping in the enum definition. This reverts commit 933decceaf6092020ba7ba768b51b2db9d5b882f.
* | | Merge pull request #22519 from bf4/test_use_renderersRafael França2015-12-314-0/+86
|\ \ \ | | | | | | | | Add tests for ActionController::Renderers::use_renderers
| * | | Test ActionController::Renderers::use_renderersBenjamin Fleischer2015-12-314-0/+86
| | |/ | |/|
* | | Merge pull request #22873 from raysrashmi/change-copyright-yearGuillermo Iguaran2015-12-3117-20/+20
|\ \ \ | | | | | | | | Update copyright notices to 2016 [ci skip]
| * | | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-3117-20/+20
|/ / /
* | | Merge pull request #22872 from javan/remove-action-cable-inspectDavid Heinemeier Hansson2015-12-314-28/+0
|\ \ \ | |/ / |/| | Remove client-side Action Cable debugging code
| * | Remove client-side Action Cable debugging codeJavan Makhmali2015-12-314-28/+0
|/ / | | | | | | Added to aid in developing Action Cable, but isn't neccessary for production operation.
* | Merge pull request #22850 from prathamesh-sonpatki/fix_ac_params_unsafe_h_2Kasper Timm Hansen2015-12-313-6/+22
|\ \ | | | | | | Fix AC::Parameters#to_unsafe_h to return all unfiltered values
| * | Fix AC::Parameters#to_unsafe_h to return all unfiltered valuesPrathamesh Sonpatki2015-12-313-6/+22
| | | | | | | | | | | | | | | | | | | | | - AC::Parameters#convert_parameters_to_hashes should return filtered or unfiltered values based on whether it is called from `to_h` or `to_unsafe_h` instead of always defaulting to `to_h`. - Fixes #22841
* | | Merge pull request #22866 from prathamesh-sonpatki/rm-dot-at-the-end-of-commandRafael França2015-12-311-2/+2
|\ \ \ | | | | | | | | Lets not put fullstop at the end of a migration pending command
| * | | Lets not put fullstop at the end of a migration pending commandPrathamesh Sonpatki2015-12-311-2/+2
| | | | | | | | | | | | | | | | - So that we can just copy paste the command and execute it
* | | | Merge pull request #22105 from ↵Rafael França2015-12-312-3/+65
|\ \ \ \ | |/ / / |/| | | | | | | | | | | morgoth/fix-errors-details-on-autosave-associations Fixed setting errors details on autosaved associations
| * | | Fixed setting errors details on autosaved associationsWojciech Wnętrzak2015-10-282-3/+65
| | | |
* | | | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-314-25/+51
|\ \ \ \ | | | | | | | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | | | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-294-25/+51
| | | | |
* | | | | Add CHANGELOG entry for #12877 [ci skip]Rafael Mendonça França2015-12-311-0/+5
| | | | |
* | | | | Merge pull request #12877 from aroben/extended-graphemesRafael França2015-12-314-16/+272
|\ \ \ \ \ | | | | | | | | | | | | Support extended grapheme clusters and UAX 29
| * | | | | Beef up #grapheme_length testsAdam Roben2013-11-131-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | We how have tests for every rule in UAX 29.
| * | | | | Support extended grapheme clusters and UAX 29Adam Roben2013-11-132-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://www.unicode.org/reports/tr29/tr29-21.html is the version of UAX 29 that corresponds to Unicode 6.2.0. Unicode.unpack_graphemes now implements all the rules listed there, including the ones for extended grapheme clusters. I added a new optional test, test/multibyte_grapheme_break_conformance.rb, that is heavily based on test/multibyte_normalization_conformance.rb, which runs the Unicode test suite.
| * | | | | Rename multibyte_conformance.rb to multibyte_normalization_conformance.rbAdam Roben2013-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is only testing normalization behavior, not any other Unicode behaviors.
| * | | | | Refactor Unicode.unpack_graphemes slightlyAdam Roben2013-11-131-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to add the rest of the rules listed in UAX 29.
* | | | | | Fix collection_radio_buttons' hidden_field name and make it appear before ↵Santiago Pastorino2015-12-315-26/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the radios Fixes #22773
* | | | | | Merge pull request #22861 from cllns/fix-typo-in-testing-guideRafael França2015-12-301-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix typo in Testing guide: test -> text
| * | | | | Fix typo: test -> textSean Collins2015-12-301-1/+1
|/ / / / /
* | | | | [ci skip] Space out framework names in USAGEKasper Timm Hansen2015-12-302-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two USAGE files were referring to Active Record and Active Model without a space, which is incorrect because we're referring to the framework name and not the constants.
* | | | | [ci skip] Update rails/all.rb reference.Kasper Timm Hansen2015-12-301-9/+10
| | | | | | | | | | | | | | | | | | | | It didn't mention Action Cable's engine.
* | | | | Merge pull request #22855 from rafbm/avoid-time-parseRafael França2015-12-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Avoid `Time.parse` for static date
| * | | | | Avoid `Time.parse` for static dateRafaël Blais Masson2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark.ips do |x| x.report('Time.parse') { Time.parse('2011-01-01') } x.report('Time.new') { Time.new(2011, 1, 1) } end Calculating ------------------------------------- Time.parse 6.640k i/100ms Time.new 15.082k i/100ms ------------------------------------------------- Time.parse 71.915k (± 3.1%) i/s - 365.200k Time.new 167.645k (± 3.3%) i/s - 844.592k
* | | | | | Add sass-rails back to the default GemfileRafael Mendonça França2015-12-302-0/+9
|/ / / / / | | | | | | | | | | | | | | | It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
* | | | | Merge pull request #22848 from derekprior/dp-postgresql-versionRafael França2015-12-301-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Make `postgresql_version` public
| * | | | | Make `postgresql_version` publicDerek Prior2015-12-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to libraries that want to feature gate based on the version of PostgreSQL the user is connected to. For instance, I want to know if the user is connected to a version of Postgres that supports concurrent materialized view refreshes. I could add that as a method on the adapter as a PR, but rails has no need for this itself. Rails is already using the postgresql_version for its own feature gating and this makes that possible for other libraries.
* | | | | | Merge pull request #22851 from prathamesh-sonpatki/fix-to-unsafe-h-testRafael França2015-12-301-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix test for AC::Parameters#to_unsafe_h
| * | | | | | Fix test for AC::Parameters#to_unsafe_hPrathamesh Sonpatki2015-12-301-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | - Test should call `to_unsafe_h` instead of `to_h`
* | | | | | Merge pull request #22241 from kamipo/add_columns_for_distinct_for_mysql57Rafael França2015-12-303-5/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BY
| * | | | | | Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BYRyuta Kamizono2015-12-233-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MySQL 5.7.5 and up, ONLY_FULL_GROUP_BY affects handling of queries that use DISTINCT and ORDER BY. It requires the ORDER BY columns in the select list for distinct queries, and requires that the ORDER BY include the distinct column. See https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html
| * | | | | | Avoid `distinct` if a subquery has already materializedRyuta Kamizono2015-12-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #19359 and avoid #22241.
* | | | | | | Merge pull request #22447 from kamipo/fix_test_to_null_agnostic_wayRafael França2015-12-303-3/+14
|\| | | | | | | |/ / / / / |/| | | | | Fix `test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct` to NULL-agnostic way
| * | | | | Fix ↵Ryuta Kamizono2015-12-193-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct` to NULL-agnostic way The sort order of NULL depends on the RDBS implementation. This commit is to fix the test to NULL-agnostic way. Example: ``` activerecord_unittest=# SELECT DISTINCT "posts"."id", author_addresses_authors.id AS alias_0 FROM "posts" LEFT OUTER JOIN "authors" ON "authors"."id" = "posts"."author_id" LEFT OUTER JOIN "author_addresses" ON "author_addresses"."id" = "authors"."author_address_id" LEFT OUTER JOIN "categorizations" ON "categorizations"."category_id" = "posts"."id" LEFT OUTER JOIN "authors" "authors_posts" ON "authors_posts"."id" = "categorizations"."author_id" LEFT OUTER JOIN "author_addresses" "author_addresses_authors" ON "author_addresses_authors"."id" = "authors_posts"."author_address_id" ORDER BY author_addresses_authors.id DESC; id | alias_0 ----+--------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 1 | 1 (12 rows) ``` ``` root@localhost [activerecord_unittest] > SELECT DISTINCT `posts`.`id`, author_addresses_authors.id AS alias_0 FROM `posts` LEFT OUTER JOIN `authors` ON `authors`.`id` = `posts`.`author_id` LEFT OUTER JOIN `author_addresses` ON `author_addresses`.`id` = `authors`.`author_address_id` LEFT OUTER JOIN `categorizations` ON `categorizations`.`category_id` = `posts`.`id` LEFT OUTER JOIN `authors` `authors_posts` ON `authors_posts`.`id` = `categorizations`.`author_id` LEFT OUTER JOIN `author_addresses` `author_addresses_authors` ON `author_addresses_authors`.`id` = `authors_posts`.`author_address_id` ORDER BY author_addresses_authors.id DESC; +----+---------+ | id | alias_0 | +----+---------+ | 1 | 1 | | 3 | NULL | | 1 | NULL | | 2 | NULL | | 4 | NULL | | 5 | NULL | | 6 | NULL | | 7 | NULL | | 8 | NULL | | 9 | NULL | | 10 | NULL | | 11 | NULL | +----+---------+ 12 rows in set (0.00 sec) ```
* | | | | | Merge pull request #22829 from jcoyne/test_parametersYves Senn2015-12-303-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | TestController#parameters returns AC::Parameters
| * | | | | | TestController#parameters returns AC::ParametersJustin Coyne2015-12-293-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22827 ActionView::TestCase::TestController#parameters should return an instance of ActionController::Parameters rather than a hash. This enables helper methods to use the correct interface.
* | | | | | | Merge pull request #22844 from prathamesh-sonpatki/issue_22836Yves Senn2015-12-301-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix documentation for configuring default_charset [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:43:43 +0000