aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix `connection#create` in PG adapterRyuta Kamizono2016-01-055-9/+13
| | | | | | Originally `connection#create` had aliased to `connection#insert` in PG adapter. But it was broken by #7447. Re-alias `create` to `insert` for fixing it.
* Merge pull request #22915 from kamipo/fix_user_name_in_docEileen M. Uchitelle2016-01-041-1/+1
|\ | | | | Fix user name in doc [ci skip]
| * Fix user name in doc [ci skip]Ryuta Kamizono2015-12-311-1/+1
| |
* | Update the maintenance policy for the next release.Rafael Mendonça França2016-01-041-3/+3
| |
* | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-042-0/+6
|\ \ | | | | | | Allow add_to_transaction with null transaction
| * | Allow add_to_transaction with null transactionEmanuel Evans2015-12-282-0/+6
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22819
* | | Merge pull request #22764 from ↵Rafael França2016-01-043-3/+43
|\ \ \ | | | | | | | | | | | | | | | | stevenspiel/titleize_model_name_for_default_submit_button_value titleize the model name on default submit buttons
| * | | downcase default submit button value's model nameSteven Spiel2016-01-013-3/+43
| | | |
* | | | Merge pull request #22890 from DNNX/times-mapSantiago Pastorino2016-01-031-1/+1
|\ \ \ \ | | | | | | | | | | Replace x.times.map{} with Array.new(x){} in AD::Journey::Path::Pattern
| * | | | Replace x.times.map{} with Array.new(x){}Viktar Basharymau2016-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former is slightly more readable, performant and has fewer method calls. ```ruby Benchmark.ips do |x| x.report('times.map') { 5.times.map{} } x.report('Array.new') { Array.new(5){} } x.compare! end __END__ Calculating ------------------------------------- times.map 21.188k i/100ms Array.new 30.449k i/100ms ------------------------------------------------- times.map 311.613k (± 3.5%) i/s - 1.568M Array.new 590.374k (± 1.2%) i/s - 2.954M Comparison: Array.new: 590373.6 i/s times.map: 311612.8 i/s - 1.89x slower ```
* | | | | Merge pull request #22904 from davydovanton/doc-typo-test-nameZachary Scott2016-01-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in test description
| * | | | | Fix typo in test desctiption [skip ci]Anton Davydov2016-01-041-1/+1
|/ / / / /
* | | | | Merge pull request #22901 from prathamesh-sonpatki/fix-gemfile-lockKasper Timm Hansen2016-01-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Updated Gemfile.lock with latest change related to sucker_punch dependency
| * | | | | Updated Gemfile.lock with latest change related to sucker_punch dependencyPrathamesh Sonpatki2016-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/bc194937ad6c1fa12bca73cfc05de39a97ba783d.
* | | | | | Merge pull request #22899 from y-yagi/move_changelog_entryKasper Timm Hansen2016-01-031-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | move CHANGELOG entry to the appropriate position [ci skip]
| * | | | | move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-01-031-3/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | petabyte and exabyte numeric conversion has been added after the 5.0.0.beta1 release. ref: 85048e90ab6ff6963919a9d10493b3910cd67b68
* | | | | Merge pull request #22889 from kamipo/remove_fixme_commentsClaudio B2016-01-021-3/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]
| * | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Arel::Nodes::Quoted` was removed already. Follow up to f916aa247bddba0c58c50822886bc29e8556df76.
* | | | | | Merge pull request #22891 from ↵Claudio B2016-01-021-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/rm-duplicate-entry-for-cache-key Remove duplicate entry for ActiveRecord::Relation#cache_key from Rails 5 release notes [ci skip]
| * | | | | | Remove duplicate entry for ActiveRecord::Relation#cache_key from Rails 5 ↵Prathamesh Sonpatki2016-01-021-3/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | release notes [ci skip]
* | | | | | Merge pull request #22895 from brandonhilkert/api-refactorMatthew Draper2016-01-031-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Ensure sucker_punch < v2 is installed due to the change in public API
| * | | | | Ensure sucker_punch < v2 is installed due to the change in public APIBrandon Hilkert2016-01-021-1/+1
|/ / / / /
* | | | | Merge pull request #22887 from y-yagi/application_record_in_pluginKasper Timm Hansen2016-01-022-4/+23
|\ \ \ \ \ | |/ / / / |/| | | | correctly presence check of `application_record.rb` in plugin
| * | | | correctly presence check of `application_record.rb` in pluginyuuji.yaginuma2016-01-022-1/+16
| | | | |
| * | | | add test of that `application_record.rb` is generated in pluginyuuji.yaginuma2016-01-021-3/+7
|/ / / /
* | | | Merge pull request #22487 from joshsoftware/issue_22413Santiago Pastorino2016-01-012-3/+3
|\ \ \ \ | | | | | | | | | | Added support for bigdecimals in perform_later
| * | | | Added support for bigdecimals in perform laterSiva Gollapalli2015-12-032-3/+3
| | | | |
* | | | | Merge pull request #22877 from kamipo/refactor_case_sensitive_comparisonRafael França2016-01-014-20/+17
|\ \ \ \ \ | | | | | | | | | | | | Refactor `case_{sensitive|insensitive}_comparison`
| * | | | | Refactor `case_{sensitive|insensitive}_comparison`Ryuta Kamizono2016-01-014-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = 'abc' LIMIT $1 [["LIMIT", 1]] ``` After: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = $1 LIMIT $2 [["title", "abc"], ["LIMIT", 1]] ```
* | | | | | New changelog entries are added to the top.Rafael Mendonça França2016-01-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #22856 from ↵Rafael França2016-01-013-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | rthbound/adds-exception-object-to-instrumenter-payload Adds exception object to instrumenter's payload
| * | | | | | Adds exception object to instrumenter's payloadRyan T. Hosford2015-12-313-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds new key/value pair to payload when an exception is raised e.g. `:exception_object=> #<RuntimeError: FAIL>` - Updates relevant test - Adds CHANGELOG entry
* | | | | | | Update copyright notice for 2016Guillermo Iguaran2016-01-011-1/+1
| | | | | | |
* | | | | | | Merge pull request #22874 from ↵Rafael França2016-01-012-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/create-application-model-under-namespaced-dir-in-plugin Create application_record.rb under namespaced directory in plugin
| * | | | | | | Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier it was creating application_record.rb under `app/models`, after this change, it will create application_record.rb under `app/models/plugin_name` similar to other application classes.
* | | | | | | | quoted_id is not public API.Rafael Mendonça França2016-01-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was made public by mistake in https://github.com/rails/rails/commit/539b69e0.
* | | | | | | | Merge pull request #22883 from mtsmfm/remove-unnecessary-enable_extensionRafael França2016-01-012-11/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unnecessary enable,disable_extension on tests
| * | | | | | | | Remove unnecessary enable,disable_extension on testsFumiaki MATSUSHIMA2016-01-022-11/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uuid-ossp extension is alreadly enabled on test schema. And `disable_extension!('uuid-ossp', connection)` can be a cause of test failure. `ActiveRecord::StatementInvalid: PG::UndefinedFunction: ERROR: function uuid_generate_v1() does not exist` will happen depending on the execution order.
* | | | | | | | Merge pull request #22860 from Timmehs/better-or-exampleClaudio B2016-01-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Better example for ActiveRecord::Relation#or [ci skip]
| * | | | | | | | Improve example of #or to use different column values in the where clausesTim Sandberg2015-12-301-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #22881 from ↵Sean Griffin2015-12-311-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iguchi1124/fix-to-remove-wasted-space-in-cable-coffee Remove a wasted space [ci skip]
| * | | | | | | | | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
|/ / / / / / / / /
* | | | / / / / / value has the right type hereSantiago Pastorino2015-12-311-1/+1
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using `enum kind: [ :any, :income, :expense ]` syntax, value is already an integer and using `enum kind: { any: 'any', income: 'income', expense: 'expense' }` syntax value is a string. This allows us to define the mapping in the enum definition. This reverts commit 933decceaf6092020ba7ba768b51b2db9d5b882f.
* | | | | | | | Merge pull request #22519 from bf4/test_use_renderersRafael França2015-12-314-0/+86
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add tests for ActionController::Renderers::use_renderers
| * | | | | | | | Test ActionController::Renderers::use_renderersBenjamin Fleischer2015-12-314-0/+86
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22873 from raysrashmi/change-copyright-yearGuillermo Iguaran2015-12-3117-20/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update copyright notices to 2016 [ci skip]
| * | | | | | | | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-3117-20/+20
|/ / / / / / / /
* | | | | | | | Merge pull request #22872 from javan/remove-action-cable-inspectDavid Heinemeier Hansson2015-12-314-28/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove client-side Action Cable debugging code
| * | | | | | | Remove client-side Action Cable debugging codeJavan Makhmali2015-12-314-28/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Added to aid in developing Action Cable, but isn't neccessary for production operation.
* | | | | | | Merge pull request #22850 from prathamesh-sonpatki/fix_ac_params_unsafe_h_2Kasper Timm Hansen2015-12-313-6/+22
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Fix AC::Parameters#to_unsafe_h to return all unfiltered values