aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23534 from bronson/fix-redefined-warningArthur Nogueira Neves2016-02-081-0/+1
|\ | | | | fix 'method redefined' warnings
| * fix 'method redefined' warningsScott Bronson2016-02-061-0/+1
| |
* | Merge pull request #23563 from pra85/patch-2Jon Moss2016-02-081-1/+1
|\ \ | | | | | | Fix a typo
| * | Fix a typoPrayag Verma2016-02-081-1/+1
|/ / | | | | Replace `a` with `an`
* | Revert "Merge pull request #23562 from Azzurrio/patch-1"Rafael Mendonça França2016-02-081-1/+1
| | | | | | | | | | | | | | This reverts commit 8c3cca5e113213958469b1cec8aa9a664535251a, reversing changes made to 9dcf67c4da35b165301865d9721da1d552f7e03f. Reason: https://github.com/rails/rails/pull/23562#issuecomment-181442569
* | Merge pull request #23562 from Azzurrio/patch-1Kasper Timm Hansen2016-02-081-1/+1
|\ \ | | | | | | Update rails-html-sanitizer version to v1.0.3
| * | Update rails-html-sanitizer version to v1.0.3Karim El-Husseiny2016-02-081-1/+1
|/ / | | | | rails-html-sanitizer 1.0.2 is vulnerable: https://groups.google.com/d/msg/rubyonrails-security/uh--W4TDwmI/m_CVZtdbFQAJ
* | Merge pull request #23560 from prathamesh-sonpatki/rm-rails-4-from-assets-guideप्रथमेश Sonpatki2016-02-081-9/+9
|\ \ | | | | | | Remove references to Rails 4 from assets guide [ci skip]
| * | Remove references to Rails 4 from assets guide [ci skip]Prathamesh Sonpatki2016-02-081-9/+9
| | |
* | | Merge pull request #23552 from bronson/revert-dev-cacheKasper Timm Hansen2016-02-086-54/+49
|\ \ \ | | | | | | | | revert dev:cache to rake task, fixes #23410
| * | | revert dev:cache to rake task, fixes #23410Scott Bronson2016-02-076-54/+49
| | |/ | |/|
* | | Merge pull request #23558 from kamipo/add_numeric_type_in_docVipul A M2016-02-081-3/+3
|\ \ \ | |_|/ |/| | Add numeric type in the doc [ci skip]
| * | Add numeric type in the doc [ci skip]Ryuta Kamizono2016-02-081-3/+3
| | | | | | | | | | | | Follow up to #23508.
* | | Merge pull request #23556 from y-yagi/remove_faye-websocket_from_readmeप्रथमेश Sonpatki2016-02-081-1/+1
|\ \ \ | | | | | | | | remove `faye-websocket` dependency from README [ci skip]
| * | | remove `faye-websocket` dependency from README [ci skip]yuuji.yaginuma2016-02-081-1/+1
| | | | | | | | | | | | | | | | `faye-websocket` gem is no longer used from 322dca293b3716ccaa09e7e82046e539b0d2ffda.
* | | | 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
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 17:33:42 +0000