aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25877 from kamipo/delegate_to_scope_rather_than_mergeMatthew Draper2017-02-215-34/+29
|\ | | | | Delegate to `scope` rather than `merge!` for collection proxy
| * Define `respond_to_missing?` instead of `respond_to?`Ryuta Kamizono2017-02-211-4/+4
| |
| * Cache target scope for collection proxyRyuta Kamizono2016-12-252-3/+4
| |
| * No need to cache collection proxies separatelyRyuta Kamizono2016-12-253-17/+1
| | | | | | | | Because merging the association scope was removed.
| * Delegate to `scope` rather than `merge!` for collection proxyRyuta Kamizono2016-12-252-14/+24
| | | | | | | | | | `merge! association.scope(nullify: false)` is expensive but most methods do not need the merge.
* | Merge pull request #28079 from ck3g/rename-osx-to-macosRobin Dupret2017-02-205-9/+9
|\ \ | | | | | | Update Guides to use macOS instead of Mac OS X [ci skip]
| * | [ci skip] Update Guides to use macOS instead of Mac OS XVitali Tatarintev2017-02-205-9/+9
|/ /
* | Merge pull request #27925 from robin850/hwia-removalKasper Timm Hansen2017-02-204-4/+49
|\ \ | | | | | | Remove the top-level `HashWithIndifferentAccess` contant
| * | Deprecate the top-level `HashWithIndifferentAccess` contantRobin Dupret2017-02-194-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | This constant was kept for the sake of backward compatibility; it is still available under `ActiveSupport::HashWithIndifferentAccess`. Furthermore, since Ruby 2.5 (https://bugs.ruby-lang.org/issues/11547) won't support top level constant lookup, people would have to update their code anyway.
* | | Import rails-ujs v0.1.0 from rails/rails-ujsGuillermo Iguaran2017-02-2011-255/+35
| | |
* | | Merge pull request #28059 from y-yagi/do_not_run_git_init_inside_test_dummyGuillermo Iguaran2017-02-202-1/+2
|\ \ \ | | | | | | | | Do not run `git init` in dummy application
| * | | Do not run `git init` in dummy applicationyuuji.yaginuma2017-02-182-1/+2
| | | |
* | | | Merge pull request #28070 from kamipo/improve_create_table_force_trueGuillermo Iguaran2017-02-201-2/+2
|\ \ \ \ | | | | | | | | | | Improve `create_table force: true`
| * | | | Improve `create_table force: true`Ryuta Kamizono2017-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Extra `data_source_exists?(table_name)` is unneeded if `drop_table(table_name, if_exists: true)` directly.
* | | | | Merge pull request #28073 from bogdanvlviv/routes-in-testsGuillermo Iguaran2017-02-204-9/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Add assertion to polymorphic_routes_test.rb
| * | | | Set correct "routes" in tests casesbogdanvlviv2017-02-203-7/+7
| | | | |
| * | | | Add assertion to polymorphic_routes_test.rbbogdanvlviv2017-02-201-2/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assertion will ensure that the behavior doesn't regress. assert_equal "/projects", polymorphic_path("projects") Remove FIXME related to polymorphic_url behavior. polymorphic_url with Symbol or String works equally. Example: default_url_options[:host] = "example.com" polymorphic_url(:projects) # => "http://example.com/projects" polymorphic_url("projects") # => "http://example.com/projects" Related to 37d4415a7b433fcb987b1c6a5b51bf2d8efc5d5e
* | | | Merge pull request #28013 from iguchi1124/fix-missing-namespace-wrapperGodfrey Chan2017-02-192-2/+8
|\ \ \ \ | | | | | | | | | | Add missing module namespacing wrapper
| * | | | Add test for generate namespaced integration testShota Iguchi2017-02-161-2/+6
| | | | |
| * | | | Add missing module namespacing wrapperShota Iguchi2017-02-151-0/+2
| | | | | | | | | | | | | | | | | | | | refs: #28011
* | | | | Merge pull request #28069 from st0012/change-back-frozen-stringMatthew Draper2017-02-202-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Unfreeze interpolated string because it's unnecessary.
| * | | | Unfreeze interpolated string because it's useless.Stan Lo2017-02-192-2/+2
|/ / / /
* | | | Share the common implementation between apps and engines.Kasper Timm Hansen2017-02-181-12/+7
| | | |
* | | | Merge pull request #28058 from y-yagi/follow_up_to_27608Jon Moss2017-02-172-23/+1
|\ \ \ \ | | | | | | | | | | Remove deprecate passing string to `:if` and `:unless` conditional options [ci skip]
| * | | | Remove deprecate passing string to `:if` and `:unless` conditional options ↵yuuji.yaginuma2017-02-182-23/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | [ci skip] Follow up to #27608
* | | | Merge pull request #28049 from notapatch/masterJon Moss2017-02-171-1/+1
|\ \ \ \ | | | | | | | | | | Change engines guide to demonstrate maintained forum
| * | | | Change engines guide to demonstrate maintained forumRichard2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Rails engine guide to references a maintained project Thredded instead of the abandoned project Forem. I chose Thredded as Forem's closing note (below) suggests the choice. https://github.com/rubysherpas/forem/blob/rails4/README.md
* | | | | Merge pull request #28053 from kamipo/remove_docAkira Matsuda2017-02-181-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | Remove `:doc:` for `NumericalityValidator` [ci skip]
| * | | | Remove `:doc:` for `NumericalityValidator` [ci skip]Ryuta Kamizono2017-02-171-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The `:doc:` was added in cdb9d7f but `NumericalityValidator` is already `:nodoc:` class. `:doc:` is unneeded. https://github.com/rails/rails/blob/master/activemodel/lib/active_model/validations/numericality.rb#L3
* | | | Merge pull request #28047 from Erol/fix-i18n-documentation-typoYves Senn2017-02-171-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in I18n Guide [ci skip]
| * | | | Fix typo in I18n Guide [ci skip]Erol Fornoles2017-02-171-1/+1
|/ / / /
* | | | Merge pull request #28040 from kenta-s/fix-doc-in-multibyte-charsJon Moss2017-02-161-4/+5
|\ \ \ \ | |/ / / |/| | | Fix doc in Multibyte::Chars [ci skip]
| * | | Fix doc in Multibyte::Chars [ci skip]kenta-s2017-02-171-4/+5
|/ / /
* | | Merge pull request #28026 from Sen-Zhang/fix_some_typos_in_commentsJon Moss2017-02-1511-11/+11
|\ \ \ | | | | | | | | Change ActiveModel::Validation to ActiveModel::Validations in comments
| * | | change ActiveModel::Validation to ActiveModel::Validations in commentsSen Zhang2017-02-1511-11/+11
|/ / /
* | | Merge pull request #28016 from kenta-s/fix-docs-of-deprecated_method_warningJon Moss2017-02-151-3/+3
|\ \ \ | | | | | | | | Remove redundant namespaces from sample code of `deprecated_method_wa…
| * | | Remove redundant namespaces from sample code of `deprecated_method_warning` ↵kenta-s2017-02-151-3/+3
| |/ / | | | | | | | | | [ci skip]
* | | Merge pull request #27993 from koic/fix_test_ar_value_too_long_using_oracleEileen M. Uchitelle2017-02-151-2/+2
|\ \ \ | | | | | | | | Fix a tests of AR::ValueTooLong when using OracleAdapter
| * | | Fix a tests of AR::ValueTooLong when using OracleAdapterKoichi ITO2017-02-141-2/+2
| | | |
* | | | Merge pull request #28018 from frewsxcv/patch-1Eileen M. Uchitelle2017-02-151-1/+1
|\ \ \ \ | |_|/ / |/| | | Indicate units of 'limit' in 'Integer' error message.
| * | | Indicate units of 'limit' in 'Integer' error message.Corey Farwell2017-02-151-1/+1
|/ / /
* | | Merge pull request #27605 from ↵Godfrey Chan2017-02-143-3/+27
|\ \ \ | | | | | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine-take-2 Fix generator command for nested (namespaced) rails engine (take 2)
| * | | Fix generator command for nested (namespaced) rails engine (take 2)Fumiaki MATSUSHIMA2017-01-073-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite https://github.com/rails/rails/pull/27550 085546df45 was reverted (b6ffb5efcb) because it change the return of `namespaced_path` from String to Array. ---------------- If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not.
* | | | Merge pull request #28000 from kamipo/remove_unused_ddl_helperRafael França2017-02-141-2/+0
|\ \ \ \ | | | | | | | | | | Remove unused DdlHelper in ForeignKeyTest
| * | | | Remove unused DdlHelper in ForeignKeyTestRyuta Kamizono2017-02-141-2/+0
|/ / / /
* | | | Merge pull request #27999 from yahonda/space_shuttlesMatthew Draper2017-02-151-11/+14
|\ \ \ \ | | | | | | | | | | Use ActiveRecord `bigint` type, not SQL literal bigint
| * | | | Use ActiveRecord `bigint` type, not SQL literal bigintYasuo Honda2017-02-141-11/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oracle database itself does not have `bigint` SQL type, then it gets `ORA-00902: invalid datatype`. It can be addressed by using ActiveRecord `bigint` type because Oracle enhanced adapter recognizes ActiveRecord `bigint` type and transfer it to its equivalent SQL type `NUMBER(19)`.
* | | | Merge pull request #27997 from kamipo/should_keep_pk_column_orderEileen M. Uchitelle2017-02-141-0/+1
|\ \ \ \ | | | | | | | | | | Should keep the primary key column order
| * | | | Should keep the primary key column orderRyuta Kamizono2017-02-141-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Fixes CI failure caused by #27961. https://travis-ci.org/rails/rails/jobs/201472146#L2390-L2409
* | | | Merge pull request #27996 from ream88/patch-1Vipul A M2017-02-141-1/+1
|\ \ \ \ | | | | | | | | | | Not ants were harmed! 🐜 [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:33:56 +0000