aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove deprecated ActiveSupport::JSON::Encoding::CircularReferenceError.Rafael Mendonça França2015-01-043-46/+4
* Remove deprecated ActiveSupport::JSON::Encoding.encode_big_decimal_as_string=Rafael Mendonça França2015-01-043-43/+5
* Remove deprecated `ActiveSupport::SafeBuffer#prepend`Rafael Mendonça França2015-01-043-16/+4
* Remove deprecated methods at `Kernel`.Rafael Mendonça França2015-01-047-128/+49
* Remove deprecated core_ext/big_decimal/yaml_conversions fileRafael Mendonça França2015-01-043-25/+5
* Remove deprecated ActiveSupport::Cache::Store.instrumentRafael Mendonça França2015-01-042-14/+5
* Merge pull request #18324 from prathamesh-sonpatki/rails-version-in-bug-templ...Vijay Dev2015-01-042-2/+2
|\
| * Update bug report templates to use version 4.2.0 instead of 5.0.0 [ci skip]Prathamesh Sonpatki2015-01-042-2/+2
|/
* Merge pull request #18319 from kamipo/sql_type_has_been_determinedRafael Mendonça França2015-01-041-4/+2
|\
| * `sql_type` has been determined already when quoting defaultsRyuta Kamizono2015-01-041-4/+2
* | Merge pull request #18318 from kamipo/stop_passing_the_column_when_quoting_de...Rafael Mendonça França2015-01-041-1/+2
|\ \
| * | Stop passing the column to the `quote` method when quoting defaultsRyuta Kamizono2015-01-041-1/+2
| |/
* | Merge pull request #18283 from kamipo/refactor_postgresql_columnRafael Mendonça França2015-01-0318-30/+29
|\ \
| * | Prefer `array?` rather than `array`Ryuta Kamizono2015-01-0418-30/+29
| |/
* | Improve the matches on the scaffold generator testsCarlos Antonio da Silva2015-01-031-9/+8
* | Merge pull request #13434 from tanraya/local_variablesCarlos Antonio da Silva2015-01-035-6/+21
|\ \ | |/ |/|
| * Use local variables in _form.html.erb generated by scaffold generator.tanraya2014-07-265-6/+21
* | Merge pull request #17227 from claudiob/explicitly-abort-callbacksRafael Mendonça França2015-01-0333-81/+507
|\ \
| * | Add config to halt callback chain on return falseclaudiob2015-01-0212-19/+191
| * | Deprecate `false` as the way to halt AR callbacksclaudiob2015-01-0215-47/+191
| * | Deprecate `false` as the way to halt AM callbacksclaudiob2015-01-023-6/+15
| * | Deprecate `false` as the way to halt AM validation callbacksclaudiob2015-01-023-6/+28
| * | Deprecate `false` as the way to halt AS callbacksclaudiob2015-01-024-4/+36
| * | Throw :abort halts default CallbackChainsclaudiob2015-01-027-14/+68
| * | Loosen test about order of initializersclaudiob2015-01-021-10/+5
* | | Remove some warningsRafael Mendonça França2015-01-031-32/+32
* | | Merge pull request #18314 from robin850/rm-tmp-sessionsRafael Mendonça França2015-01-035-27/+17
|\ \ \
| * | | Remove the tmp/sessions folder and its clear taskRobin Dupret2015-01-035-27/+17
|/ / /
* | | Fix a few typos [ci skip]Robin Dupret2015-01-034-5/+5
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-0317-40/+74
|\ \ \
| * | | Use Active Model, not ActiveModel in plain Englishclaudiob2015-01-028-10/+10
| * | | [ci skip] :scissors: a blank line from code (Active Job Guide).Juanito Fatas2015-01-021-1/+0
| * | | Fix doc formatting for `count_by_sql`claudiob2015-01-011-3/+4
| * | | Fix "Rendering" not to link to AV::Renderingclaudiob2014-12-251-5/+5
| * | | Better docs for NameErrorclaudiob2014-12-251-0/+14
| * | | Better docs for AbstractControllerclaudiob2014-12-223-18/+24
| * | | Add docs for `Rails.env` and `Rails.env=`claudiob2014-12-221-0/+8
| * | | Add docs for `Object.nil!`claudiob2014-12-221-3/+9
* | | | Merge pull request #18310 from robin850/guides-improvementsXavier Noria2015-01-036-7/+15
|\ \ \ \
| * | | | Avoid displaying new lines inside note paragraphsRobin Dupret2015-01-033-3/+11
| * | | | Consider `html+erb` as a valid language for snippetsRobin Dupret2015-01-031-1/+1
| * | | | Update Redcarpet to version 3.2.2Robin Dupret2015-01-032-3/+3
|/ / / /
* | | | Merge pull request #18309 from PaBLoX-CL/fix-fixtures-referencesRafael Mendonça França2015-01-023-5/+11
|\ \ \ \
| * | | | Generated fixtures won't use parent_id when generated with parent:referencesPablo Olmos de Aguilera Corradini2015-01-022-5/+7
|/ / / /
* | | | Merge pull request #10380 from JonRowe/test_all_domain_2_letter_tldRafael Mendonça França2015-01-021-0/+7
|\ \ \ \
| * | | | add test asserting that 2 letter tlds with 3 letter domain names work when op...Jon Rowe2013-04-301-0/+7
* | | | | Merge pull request #18307 from brainopia/datetime_regressionRafael Mendonça França2015-01-022-1/+13
|\ \ \ \ \
| * | | | | Support datetime values in AR::Type::DateTime#type_cast_for_databasebrainopia2015-01-032-1/+13
* | | | | | Merge pull request #18308 from jcoyne/i18n_translate_safetyRafael Mendonça França2015-01-023-19/+20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Unsafe default translations should not be marked html_safeJustin Coyne2015-01-023-19/+20