aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix indentation [ci skip]Yauheni Dakuka2017-08-245-11/+11
|
* Merge pull request #30349 from ydakuka/patch-1Ryuta Kamizono2017-08-221-4/+4
|\ | | | | Update debugging rails applications guide [ci skip]
| * Update debugging_rails_applications [ci skip]Yauheni Dakuka2017-08-211-4/+4
|/
* Merge pull request #28912 from kaspth/getting-started-form-withKasper Timm Hansen2017-08-212-67/+100
|\ | | | | [ci skip] form_with in the getting started guide.
| * [ci skip] form_with in the getting started guide.Kasper Timm Hansen2017-08-212-67/+100
| | | | | | | | Add back a bit about a resource oriented style of routing.
* | Merge pull request #30346 from ↵Ryuta Kamizono2017-08-222-2/+2
|\ \ | | | | | | | | | | | | yhirano55/fix_broken_link_to_mysql_docs_in_database_yml Fix broken link to mysql docs in database.yml [ci skip]
| * | Fix broken link to mysql docs in database.yml [ci skip]Yoshiyuki Hirano2017-08-222-2/+2
|/ /
* | Merge pull request #30345 from yhirano55/fix_link_contributing_guideEileen M. Uchitelle2017-08-211-7/+7
|\ \ | | | | | | Fix link in Contributing Ruby on Rails guide [ci skip]
| * | Fix link Contributing Ruby on Rails [ci skip]Yoshiyuki Hirano2017-08-211-7/+7
|/ / | | | | | | | | | | | | | | | | * Add Contributing to the Rails Code link. * Wiki link for Spanish is redirect. * The base branch of Polish repo is master. And Turkish is, too. * Unified expression `rails-dev-box` * The Clone url is wrong. * The mailing list url is old.
* | Merge pull request #30344 from yhirano55/update_guide_contributing_ruby_on_railsप्रथमेश Sonpatki2017-08-211-1/+1
|\ \ | | | | | | Update Contributing to Ruby on Rails guide [ci skip]
| * | Update Contributing to Ruby on Rails guide [ci skip]Yoshiyuki Hirano2017-08-211-1/+1
|/ /
* | Merge pull request #30343 from yhirano55/update_generator_guideVipul A M2017-08-211-4/+8
|\ \ | | | | | | Update generator guide [ci skip]
| * | Update generator guide [ci skip]Yoshiyuki Hirano2017-08-211-4/+8
| | |
* | | Prevent extra `SET time zone` in `configure_connection` (#28413)Ryuta Kamizono2017-08-212-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | `SET time zone 'value'` is an alias for `SET timezone TO 'value'`. https://www.postgresql.org/docs/current/static/sql-set.html So if `variables["timezone"]` is specified, it is enough to `SET timezone` once.
* | | 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]