aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Group related methods togetherBenjamin Fleischer2016-01-031-67/+67
|
* Add ActionController:Renderers testBenjamin Fleischer2016-01-033-24/+99
| | | | To complement actionpack/test/controller/metal/renderers_test.rb
* 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
| * | | | Fix AC::Parameters#to_unsafe_h to return all unfiltered valuesPrathamesh Sonpatki2015-12-313-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AC::Parameters#convert_parameters_to_hashes should return filtered or unfiltered values based on whether it is called from `to_h` or `to_unsafe_h` instead of always defaulting to `to_h`. - Fixes #22841
* | | | | Merge pull request #22866 from prathamesh-sonpatki/rm-dot-at-the-end-of-commandRafael França2015-12-311-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Lets not put fullstop at the end of a migration pending command
| * | | | | Lets not put fullstop at the end of a migration pending commandPrathamesh Sonpatki2015-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | - So that we can just copy paste the command and execute it
* | | | | | Merge pull request #22105 from ↵Rafael França2015-12-312-3/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | morgoth/fix-errors-details-on-autosave-associations Fixed setting errors details on autosaved associations
| * | | | | Fixed setting errors details on autosaved associationsWojciech Wnętrzak2015-10-282-3/+65
| | | | | |
* | | | | | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-314-25/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | | | | | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-294-25/+51
| | | | | | |
* | | | | | | Add CHANGELOG entry for #12877 [ci skip]Rafael Mendonça França2015-12-311-0/+5
| | | | | | |
* | | | | | | Merge pull request #12877 from aroben/extended-graphemesRafael França2015-12-314-16/+272
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support extended grapheme clusters and UAX 29
| * | | | | | | Beef up #grapheme_length testsAdam Roben2013-11-131-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We how have tests for every rule in UAX 29.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 18:22:59 +0000