aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23554 from romaimperator/update_action_cable_config_exampleJon Moss2016-02-071-3/+3
|\ | | | | config examples for ActionCable now use Rails.application.config.action_cable
| * config examples for ActionCable now use Rails.application.config.action_cableDaniel Fox2016-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | Some existing examples used ActionCable.server.config but for configuring allowed_request_origins that is overridden in development mode. The correct place to set that is Rails.application.config.action_cable which the ActionCable initializer loads from. I thought the other two examples should be changed as well just in case a default value that would override a configured value is introduced for either log_tags or disable_request_forgery_protection in the future.
* | Merge pull request #23559 from mabras/patch-1Richard Schneeman2016-02-071-2/+2
|\ \ | | | | | | update turbolinks url [ci skip]
| * | update turbolinks url [ci skip]mabras2016-02-081-2/+2
|/ /
* | Merge pull request #23547 from kamipo/schema_type_returns_symbolSean Griffin2016-02-073-8/+8
|\ \ | |/ |/| `schema_type` returns symbol rather than string
| * `schema_type` returns symbol rather than stringRyuta Kamizono2016-02-083-8/+8
| | | | | | | | | | | | | | | | | | A return value of `schema_type` is used by: 1. primary key type: using as `symbol.inspect` 2. normal column type: using as `symbol.to_s` It is better to return symbol.
* | Merge pull request #23508 from meinac/add_numeric_type_into_migrationsSean Griffin2016-02-072-0/+12
|\ \ | | | | | | Added numeric helper into `SchemaStatements` for MySQL and PostgreSQL
| * | Added numeric helper into migrations.Mehmet Emin İNAÇ2016-02-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, you can add a column into the table like: ``` create_table(:numeric_types) do |t| t.numeric :foo, precision: 10, scale: 2, default: 2.0 end ``` The result of the migration above is same with: ``` create_table(:numeric_types) do |t| t.decimal :foo, precision: 10, scale: 2, default: 2.0 end ```
* | | Merge pull request #23531 from coldnebo/docfixJon Moss2016-02-072-3/+6
|\ \ \ | | | | | | | | doc changes to clarify asset pipeline
| * | | doc changesLarry Kyrala2016-02-072-3/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for rails/rails#23431 modified: guides/source/asset_pipeline.md * description of asset combination from apps and gems, e.g. jquery-rails * after @vipulnsward's related change rails/rails#23479 correction: --skip-sprockets will prevent all of these gems, not just sass-rails and uglifier modified: guides/source/working_with_javascript_in_rails.md * noted that rails.js requires the asset pipeline [ci skip]
* | | Merge pull request #23532 from matthewd/live-interlockMatthew Draper2016-02-084-48/+252
|\ \ \ | | | | | | | | Hand off the interlock to the new thread in AC::Live
| * | | Manual yield doesn't block new sharesMatthew Draper2016-02-081-5/+6
| | | |
| * | | Test the happy path for recursive yields tooMatthew Draper2016-02-081-0/+35
| | | |
| * | | Fix a nonsensical ShareLock test.thedarkone2016-02-071-22/+21
| | | |
| * | | Eagerly reacquire when start_sharing is nested inside yield_sharesMatthew Draper2016-02-081-11/+18
| | | | | | | | | | | | | | | | A full write-preferring wait can lead to deadlock.
| * | | AS::Conc::ShareLock#yield_shares tests.thedarkone2016-02-071-0/+107
| | | |
| * | | Hand off the interlock to the new thread in AC::LiveMatthew Draper2016-02-074-38/+93
| | |/ | |/| | | | | | | | | | | | | Most importantly, the original request thread must yield its share lock while waiting for the live thread to commit -- otherwise a request's base and live threads can deadlock against each other.
* | | Add SVG as a default mime typeDavid Heinemeier Hansson2016-02-072-0/+5
| | |
* | | Merge pull request #23540 from vipulnsward/publish-api-apps-docVijay Dev2016-02-071-1/+0
|\ \ \ | | | | | | | | Publish guide on "Using Rails for API-only Applications"
| * | | Publish guide on "Using Rails for API-only Applications"Vipul A M2016-02-071-1/+0
|/ / / | | | | | | | | | | | | Fixes #23322 [ci skip]
* | | Separate for new and existing applications clearlyVijay Dev2016-02-071-0/+4
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-02-074-15/+16
|\ \ \
| * | | fix indentationVijay Dev2016-02-071-1/+1
| | | |
| * | | [ci skip] Good bye SQLite2yui-knk2016-02-061-2/+0
| | | | | | | | | | | | | | | | Follow up of https://github.com/rails/rails/commit/c9feea6c9ab4494b0cb0b8cf4316847854f65af6
| * | | [ci skip] fix typoMikhail Dieterle2016-01-301-1/+1
| | | |
| * | | [ci skip] Fix one more typoPrathamesh Sonpatki2016-01-301-1/+1
| | | | | | | | | | | | | | | | - Followup of https://github.com/rails/docrails/commit/10bc49710b7205a6172c3e072b3c77114fefd952
| * | | [ci skip] Update internal documents about ActiveRecord's Reflectionyui-knk2016-01-301-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord's Reflection was refactored by f8d2899d12d59360f29c5eb6a1b1a8fe4ec82ca0 . Top of ancestors chain was changed to `AbstractReflection` from `MacroReflection`, and new Reflections were added.
| * | | [ci skip] Fix typoyui-knk2016-01-271-1/+1
| | | |
* | | | Merge pull request #23533 from y-yagi/fix_typo_in_assert_enqueued_jobs_exampleJon Moss2016-02-061-1/+1
|\ \ \ \ | |_|/ / |/| | | fix typo in `assert_enqueued_jobs` example [ci skip]
| * | | fix typo in `assert_enqueued_jobs` example [ci skip]yuuji.yaginuma2016-02-071-1/+1
| | | |
* | | | Merge pull request #23519 from kamipo/mariadb_does_not_support_json_typeSean Griffin2016-02-061-1/+1
|\ \ \ \ | | | | | | | | | | MariaDB does not support JSON type
| * | | | MariaDB does not support JSON typeRyuta Kamizono2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #22980.
* | | | | Avoid coupling Action Pack to Railties.Kasper Timm Hansen2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referencing Rails.env without checking if it's defined couples us to Railties. Fix by avoiding the line breaks if we don't have an env check to rely on.
* | | | | Merge pull request #23529 from syamilmj/remove_unused_methodRafael França2016-02-061-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused private method
| * | | | | Remove unused private methodSyamil MJ2016-02-071-4/+0
|/ / / / /
* | | | | Merge pull request #23520 from kamipo/remove_duplicated_require_arelSean Griffin2016-02-061-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove duplicated `require 'arel'`
| * | | | Remove duplicated `require 'arel'`Ryuta Kamizono2016-02-061-1/+0
| |/ / / | | | | | | | | | | | | It appears first in `lib/active_record.rb`.
* | | | Merge pull request #23517 from gsamokovarov/yay-youre-on-railsEileen M. Uchitelle2016-02-062-2/+2
|\ \ \ \ | |/ / / |/| | | Replace old Rails greeting references
| * | | Replace old Rails greeting referencesGenadi Samokovarov2016-02-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of the READMEs were still referring the old welcome page. This is a small change that goes over it. [ci skip]
* | | | Merge pull request #23513 from kamipo/revert-23502-update-travis-masterKasper Timm Hansen2016-02-061-2/+2
|\ \ \ \ | | | | | | | | | | Revert "No need to specify Ruby patch version on Travis CI"
| * | | | Revert "No need to specify Ruby patch version on Travis CI"Ryuta Kamizono2016-02-061-2/+2
| | | | |
* | | | | Merge pull request #23514 from y-yagi/revert_mailer_doc_fixKasper Timm Hansen2016-02-062-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Revert "When generating a mailer, you must specify Mailer in the class name in"
| * | | | Revert "When generating a mailer, you must specify Mailer in the class name in"yuuji.yaginuma2016-02-062-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8417d967e016f0219cc4ec30bf0d3908ce6cd29b. In 5697bdbb6da5d08e541a3b12251cec90269b059b and af3eb5961e55a46b011be797e71f615f20f56686, add mailer suffix to generated files and classes. Therefore, no longer need to specify `Mailer` to class name. [ci skip]
* | | | add missing requireAaron Patterson2016-02-051-0/+1
| | | |
* | | | Fix mixing line filters with Minitest's -n filter.Kasper Timm Hansen2016-02-052-4/+36
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit accidentally broke mixing line filters with string -n filter. Fix by checking if it is a string and returning it. We also need to ensure the -n filter carry forward into any other composite filters. Fix by letting the named filter be extractable, so we'll keep this for the next runnable's run.
* | | Revert "Dump indexes in `create_table` instead of `add_index`"Sean Griffin2016-02-053-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 99801c6a7b69eb4b006a55de17ada78f3a0fa4c1. Ultimately it doesn't matter whether `add_index` or `t.index` are used in the schema dumper in any meaningful way. There are gems out there which hook into the old behavior for things like indexing materialized views. Since the reverted commit doesn't seem to add much benefit, there's no reason for us to break these gems.
* | | Merge pull request #23502 from sikachu/update-travis-masterRafael França2016-02-051-2/+2
|\ \ \ | | | | | | | | No need to specify Ruby patch version on Travis CI
| * | | No need to specify Ruby patch version on Travis CIPrem Sichanugrist2016-02-051-2/+2
|/ / / | | | | | | | | | | | | Travis CI now select the latest patch version of Ruby automatically when given MAJOR.MINOR version string.
* | / disable controller / view thread spawning in testsAaron Patterson2016-02-053-3/+31
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests can (and do) access the database from the main thread. In this case they were starting a transaction, then making a request. The request would create a new thread, which would allocate a new database connection. Since the main thread started a transaction that contains data that the new thread wants to see, the new thread would not see it due to data visibility from transactions. Spawning the new thread in production is fine because middleware should not be doing database manipulation similar to the test harness. Before 603fe20c it was possible to set the database connection id based on a thread local, but 603fe20c changes the connection lookup code to never look at the "connection id" but only at the thread object itself. Without that indirection, we can't force threads to use the same connection pool as another thread. Fixes #23483
* | Merge pull request #23500 from akaspick/mailer_doc_fixRafael França2016-02-052-2/+2
|\ \ | | | | | | When generating a mailer, you must specify Mailer in the class name
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 22:50:11 +0000