aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Support extended grapheme clusters and UAX 29Adam Roben2013-11-132-0/+91
| * | | | Rename multibyte_conformance.rb to multibyte_normalization_conformance.rbAdam Roben2013-11-131-2/+2
| * | | | Refactor Unicode.unpack_graphemes slightlyAdam Roben2013-11-131-13/+23
* | | | | Fix collection_radio_buttons' hidden_field name and make it appear before the...Santiago Pastorino2015-12-315-26/+42
* | | | | Merge pull request #22861 from cllns/fix-typo-in-testing-guideRafael França2015-12-301-1/+1
|\ \ \ \ \
| * | | | | Fix typo: test -> textSean Collins2015-12-301-1/+1
|/ / / / /
* | | | | [ci skip] Space out framework names in USAGEKasper Timm Hansen2015-12-302-5/+5
* | | | | [ci skip] Update rails/all.rb reference.Kasper Timm Hansen2015-12-301-9/+10
* | | | | Merge pull request #22855 from rafbm/avoid-time-parseRafael França2015-12-301-1/+1
|\ \ \ \ \
| * | | | | Avoid `Time.parse` for static dateRafaël Blais Masson2015-12-301-1/+1
* | | | | | Add sass-rails back to the default GemfileRafael Mendonça França2015-12-302-0/+9
|/ / / / /
* | | | | Merge pull request #22848 from derekprior/dp-postgresql-versionRafael França2015-12-301-5/+5
|\ \ \ \ \
| * | | | | Make `postgresql_version` publicDerek Prior2015-12-301-5/+5
* | | | | | Merge pull request #22851 from prathamesh-sonpatki/fix-to-unsafe-h-testRafael França2015-12-301-2/+2
|\ \ \ \ \ \
| * | | | | | Fix test for AC::Parameters#to_unsafe_hPrathamesh Sonpatki2015-12-301-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22241 from kamipo/add_columns_for_distinct_for_mysql57Rafael França2015-12-303-5/+67
|\ \ \ \ \ \
| * | | | | | Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BYRyuta Kamizono2015-12-233-2/+62
| * | | | | | Avoid `distinct` if a subquery has already materializedRyuta Kamizono2015-12-231-3/+5
* | | | | | | Merge pull request #22447 from kamipo/fix_test_to_null_agnostic_wayRafael França2015-12-303-3/+14
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Fix `test_find_with_order_on_included_associations_with_construct_finder_sql_...Ryuta Kamizono2015-12-193-3/+14
* | | | | | Merge pull request #22829 from jcoyne/test_parametersYves Senn2015-12-303-1/+10
|\ \ \ \ \ \
| * | | | | | TestController#parameters returns AC::ParametersJustin Coyne2015-12-293-1/+10
* | | | | | | Merge pull request #22844 from prathamesh-sonpatki/issue_22836Yves Senn2015-12-301-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix documentation for configuring default_charset [ci skip]Prathamesh Sonpatki2015-12-301-2/+2
* | | | | | | | Merge pull request #22842 from akshay-vishnoi/typo-fixYves Senn2015-12-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typoAkshay Vishnoi2015-12-301-1/+1
* | | | | | | | | Merge pull request #22843 from akshay-vishnoi/fix-release-5Yves Senn2015-12-301-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Put all removals in its sectionAkshay Vishnoi2015-12-301-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #22845 from yui-knk/remove_not_used_fixtureYves Senn2015-12-301-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove not used test fixtureyui-knk2015-12-301-1/+0
* | | | | | | | | Merge pull request #22803 from kamipo/improve_select_one_in_mysql2_adapterRafael França2015-12-302-27/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove outdated commentRyuta Kamizono2015-12-271-28/+0
| * | | | | | | | | Improve `select_one` in `Mysql2Adapter`Ryuta Kamizono2015-12-272-0/+16
* | | | | | | | | | Merge pull request #22547 from kamipo/fix_create_table_info_cacheRafael França2015-12-291-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly cache create_table_infoRyuta Kamizono2015-12-171-2/+6
* | | | | | | | | | | Merge pull request #22830 from jcoyne/parameters_includeRichard Schneeman2015-12-293-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add AC::Parameters#include?Justin Coyne2015-12-293-1/+11
| | |_|_|_|/ / / / / / | |/| | | | | | | | |