aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #30341 from yhirano55/update_rails_on_rack_guideप्रथमेश Sonpatki2017-08-211-1/+1
|\ \ \ \ | |/ / / |/| | | Update Rails on Rack guide [ci skip]
| * | | Update Rails on Rack guide [ci skip]Yoshiyuki Hirano2017-08-211-1/+1
|/ / /
* | | Merge pull request #30332 from y-yagi/fix_29306George Claghorn2017-08-207-17/+44
|\ \ \ | | | | | | | | Make `restart` and `dev:cache` tasks work when customizing pid file path
| * | | Make `restart` and `dev:cache` tasks work when customizing pid file pathyuuji.yaginuma2017-08-217-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, it hard-coded pid file path. It can not be removed when customizing pid file path. But rake task can not get pid file path. Therefore, do not remove file in rake task, makes it possible to judge whether it is restart from the argument of the command and removes the file in server command. Fixes #29306
* | | | Merge pull request #30340 from ↵Ryuta Kamizono2017-08-211-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yhirano55/update_autoloading_and_reloading_constants Update Autoloading and Reloading Constants guide [ci skip]
| * | | | Update result of autoload_paths in Autoloading and Reloading Constants guide ↵Yoshiyuki Hirano2017-08-211-1/+10
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Update regexGeorge Claghorn2017-08-201-1/+1
| | | |
* | | | Fix testsGeorge Claghorn2017-08-204-4/+4
| | | |
* | | | Fix syntax errorGeorge Claghorn2017-08-201-1/+1
| | | |
* | | | DRYGeorge Claghorn2017-08-208-16/+20
| | | |
* | | | Rename ActiveStorage::Filename#extname to extension_with_delimiterGeorge Claghorn2017-08-202-9/+29
| | | |
* | | | Merge pull request #30339 from bogdanvlviv/add-activestorage_bin_test-fileGeorge Claghorn2017-08-201-0/+5
|\ \ \ \ | | | | | | | | | | Add executable file `activestorage/bin/test`
| * | | | Add executable file `activestorage/bin/test`bogdanvlviv2017-08-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` rails$ cd activestorage/ rails/activestorage$ bin/test ........(compressed).... rails/activestorage$ bin/test test/controllers/disk_controller_test.rb .(compressed).. rails/activestorage$ bin/test test/controllers/disk_controller_test.rb:42 . ```
* | | | | Merge pull request #30121 from assain/add_expires_in_and_expires_at_to_cookiesKasper Timm Hansen2017-08-203-5/+54
|\ \ \ \ \ | | | | | | | | | | | | Add expiry metadata to Cookies and freshen expires option to support duration
| * | | | | freshen :expires option with duration support and add expiry metadata to cookiesAssain2017-08-203-5/+54
| | | | | |
* | | | | | Require "active_support/core_ext/hash/compact" for `compact!`Ryuta Kamizono2017-08-211-0/+2
| | | | | |
* | | | | | Prefer formatted number as schema version [ci skip]Ryuta Kamizono2017-08-211-1/+1
| | | | | |
* | | | | | Place `update_table_definition` consistently in `SchemaStatements`Ryuta Kamizono2017-08-216-12/+12
| | | | | |
* | | | | | Don't expose `prepare_column_options`Ryuta Kamizono2017-08-213-52/+30
| |/ / / / |/| | | | | | | | | | | | | | | | | | | This is only used for the internal `column_spec` and `column_spec_for_primary_key`.
* | | | | Merge pull request #30335 from ↵Ryuta Kamizono2017-08-201-13/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/update_debugging_rails_applications_guide Update Debugging Rails Applications guide [ci skip]
| * | | | | Update Debugging Rails Applications guide [ci skip]Yoshiyuki Hirano2017-08-201-13/+9
|/ / / / /
* | | | | Register integer types limit correctly for postgresql adapter (#26386)Ryuta Kamizono2017-08-201-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently integer types extracts the `limit` from `sql_type`. But the lookup key of type map is the `oid` in postgresql adapter. So in most case `sql_type` is passed to `extract_limit` as `""` and `limit` is extracted as `nil`. https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L445 In mysql2 adapter, `limit` is registered correctly without extracting from `sql_type`. https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L678-L682 Postgresql adapter should also be registered correctly. ``` ruby conn = ActiveRecord::Base.connection conn.select_all("SELECT 1::smallint, 2::integer, 3::bigint").column_types.map do |name, type| [name, type.limit] end ``` Before: ``` ruby # => [["int2", nil], ["int4", nil], ["int8", nil]] ``` After: ``` ruby # => [["int2", 2], ["int4", 4], ["int8", 8]] ```
* | | | | Merge pull request #30331 from ↵George Claghorn2017-08-191-7/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/update_rails_initialization_process_guide Update The Rails Initialization Process of guide [ci skip]
| * | | | | Update The Rails Initialization Process of guide [ci skip]Yoshiyuki Hirano2017-08-201-7/+10
| | | | | |
* | | | | | Merge pull request #30330 from ↵George Claghorn2017-08-191-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/update_database_config_in_command_line_of_guide Update database config in The Rails Comamnd Line of guide [ci skip]
| * | | | | | Update database config in The Rails Comamnd Line of guide [ci skip]Yoshiyuki Hirano2017-08-201-4/+7
| |/ / / / /
* / / / / / Attributes are protected, not private, to avoid the warningMatthew Draper2017-08-201-1/+2
|/ / / / /
* | | | | Merge pull request #30325 from koic/fix_doc_format_in_active_storage_setupArun Agrawal2017-08-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix doc format in Active Storage Setup [ci skip]
| * | | | | Fix doc format in Active Storage Setup [ci skip]Koichi ITO2017-08-191-1/+1
|/ / / / / | | | | | | | | | | | | | | | Follow up of 2ebb284ef5bf2c36bd8ba0a4524cab83810f12ab.
* | | | | Merge pull request #30324 from koic/fix_cant_modify_frozen_string_in_ar_testMatthew Draper2017-08-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix `can't modify frozen String` error in an AR test
| * | | | | Fix `can't modify frozen String` error in an AR testKoichi ITO2017-08-191-2/+2
|/ / / / /
* | | | | Merge pull request #30322 from zokioki/fix_action_dispatch_typoRyuta Kamizono2017-08-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in "Ambiguous route definition" error message
| * | | | | fix typo in ambiguous route definition error messageZoran Pesic2017-08-181-1/+1
|/ / / / /
* | | | | Merge pull request #30319 from y-yagi/remove_unused_requireRyuta Kamizono2017-08-191-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused require
| * | | | | Remove unused requireyuuji.yaginuma2017-08-191-1/+0
| | |/ / / | |/| | | | | | | | | | | | | Since 0d72489, this file does not use `method_source`.
* | | | | Merge pull request #30317 from yhirano55/use_ssl_in_guide_and_commentArun Agrawal2017-08-1911-18/+18
|\ \ \ \ \ | |/ / / / |/| | | | Use https in guide and comment [ci skip]
| * | | | Use ssl in guide and comment [ci skip]Yoshiyuki Hirano2017-08-1911-18/+18
|/ / / /
* | | | Merge pull request #30308 from ↵Rafael França2017-08-181-7/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | DNNX/rm-pointless-flatten-and-compact-from-am-errors Simplify ActiveModel::Errors#generate_message
| * | | | Simplify ActiveModel::Errors#generate_messageViktar Basharymau2017-08-181-7/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides making the code easier to read, this commit also makes it faster: * We don't eval `@base.class.respond_to?(:i18n_scope)` twice * We only eval `@base.class.i18n_scope` once * We don't call `flatten!` because it's not needed anymore * We don't call `compact` because all elements are Symbols
* | | | Merge pull request #30314 from yhirano55/use_https_instead_of_http_in_guideGeorge Claghorn2017-08-181-8/+8
|\ \ \ \ | | | | | | | | | | Use https instead of http or git in guide [ci skip]
| * | | | Use https instead of http or git in guide [ci skip]Yoshiyuki Hirano2017-08-191-8/+8
|/ / / / | | | | | | | | | | | | * Update url in Development Dependencies Install
* | | | Cleanup development_dependencies_install.mdJon Moss2017-08-181-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Lots of grammar cleanup, and also changing to use macOS. [ci skip]
* | | | Add Yarn installation instructions for Active StorageJon Moss2017-08-181-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a requirement when working on the JS portions of ASt. Using npm instead of Yarn is a bad idea here since the lockfile is in Yarn's format. [ci skip]
* | | | Merge pull request #30311 from maclover7/jm-rm-ccMatthew Draper2017-08-191-7/+0
|\ \ \ \ | | | | | | | | | | Remove Active Storage code climate config file
| * | | | Remove Active Storage code climate config fileJon Moss2017-08-181-7/+0
|/ / / / | | | | | | | | | | | | There's already a .codeclimate.yml file at the root of the project.
* | | | Improve `migration/column_attributes_test.rb` (#25286)Ryuta Kamizono2017-08-181-3/+17
| | | | | | | | | | | | | | | | | | | | * Test `test_unabstracted_database_dependent_types` for `PostgreSQLAdapter` * Add `test_change_column_with_new_precision_and_scale` for `SQLite3Adapter` * This test case and comment was lost at 28bb02a78fd47527bb7a208d01a4594bb212812c
* | | | Add deterministic sorting order for `test_taking_with_a_number`Ryuta Kamizono2017-08-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise random CI failure will be caused. https://travis-ci.org/rails/rails/jobs/265848046#L777
* | | | Restore the ability that SQL with binds for `insert`, `update`, and `delete` ↵Ryuta Kamizono2017-08-182-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#29944) Since 213796f, it was lost the ability that SQL with binds for `insert`, `update`, and `delete` (like `select_all`). This restores the ability because `insert`, `update`, and `delete` are public API, so it should not be removed without deprecation.
* | | | Add test cases that class level `destroy`, `delete`, and `update` are ↵Ryuta Kamizono2017-08-181-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | affected by scoping (#29997) I tried to change the expectation in #29976, but it is expected behavior at least for now. So I added the test cases to prevent anyone change the expectation.
* | | | Restore `to_sql` to return only SQL (#29945)Ryuta Kamizono2017-08-186-13/+15
| | | | | | | | | | | | | | | | Because `to_sql` is public API. I introduced `to_sql_and_binds` internal API to return SQL and binds.