aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22904 from davydovanton/doc-typo-test-nameZachary Scott2016-01-041-1/+1
|\
| * 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 dependencyPrathamesh Sonpatki2016-01-031-1/+1
* | 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]yuuji.yaginuma2016-01-031-3/+2
|/
* Merge pull request #22889 from kamipo/remove_fixme_commentsClaudio B2016-01-021-3/+0
|\
| * Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
* | Merge pull request #22891 from prathamesh-sonpatki/rm-duplicate-entry-for-cac...Claudio B2016-01-021-3/+0
|\ \
| * | Remove duplicate entry for ActiveRecord::Relation#cache_key from Rails 5 rele...Prathamesh Sonpatki2016-01-021-3/+0
| |/
* | 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 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 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 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`Ryuta Kamizono2016-01-014-20/+17
* | | New changelog entries are added to the top.Rafael Mendonça França2016-01-011-6/+6
* | | Merge pull request #22856 from rthbound/adds-exception-object-to-instrumenter...Rafael França2016-01-013-1/+8
|\ \ \
| * | | Adds exception object to instrumenter's payloadRyan T. Hosford2015-12-313-1/+8
* | | | Update copyright notice for 2016Guillermo Iguaran2016-01-011-1/+1
* | | | Merge pull request #22874 from prathamesh-sonpatki/create-application-model-u...Rafael França2016-01-012-0/+0
|\ \ \ \
| * | | | Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
* | | | | quoted_id is not public API.Rafael Mendonça França2016-01-011-1/+1
* | | | | Merge pull request #22883 from mtsmfm/remove-unnecessary-enable_extensionRafael França2016-01-012-11/+0
|\ \ \ \ \
| * | | | | Remove unnecessary enable,disable_extension on testsFumiaki MATSUSHIMA2016-01-022-11/+0
|/ / / / /
* | | | | Merge pull request #22860 from Timmehs/better-or-exampleClaudio B2016-01-011-2/+2
|\ \ \ \ \
| * | | | | Improve example of #or to use different column values in the where clausesTim Sandberg2015-12-301-2/+2
* | | | | | Merge pull request #22881 from iguchi1124/fix-to-remove-wasted-space-in-cable...Sean Griffin2015-12-311-1/+1
|\ \ \ \ \ \
| * | | | | | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
|/ / / / / /
* | | | / / value has the right type hereSantiago Pastorino2015-12-311-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #22519 from bf4/test_use_renderersRafael França2015-12-314-0/+86
|\ \ \ \ \
| * | | | | 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]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 codeJavan Makhmali2015-12-314-28/+0
|/ / / /
* | | | 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 valuesPrathamesh Sonpatki2015-12-313-6/+22
* | | | | 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 commandPrathamesh Sonpatki2015-12-311-2/+2
* | | | | | Merge pull request #22105 from morgoth/fix-errors-details-on-autosave-associa...Rafael França2015-12-312-3/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Beef up #grapheme_length testsAdam Roben2013-11-131-3/+29