aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-146-20/+3
|\
| * `substitute_at` is no longer usedRyuta Kamizono2016-01-146-20/+3
* | Properly include the `from` clause when merging relationsSean Griffin2016-01-142-0/+10
* | Ensure enum scopes work properly with STI and inheritanceSean Griffin2016-01-141-1/+1
* | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v...Richard Schneeman2016-01-142-19/+58
|\ \
| * | Set environment even when no migration runsschneems2016-01-112-1/+37
| * | Clean up duplicate migration logicschneems2016-01-112-18/+21
* | | Merge pull request #23054 from ankit1910/update-docJon Moss2016-01-141-0/+1
|\ \ \
| * | | update doc for << method of has_many associationankit19102016-01-141-0/+1
* | | | Merge pull request #23056 from ankit1910/fix-typoRafael França2016-01-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] fix typo in docsankit19102016-01-141-1/+1
|/ / /
* | | Merge pull request #23049 from sevenseacat/patch-1Jon Moss2016-01-131-2/+2
|\ \ \
| * | | Fix typo in docs [ci skip]Rebecca Skinner2016-01-141-2/+2
|/ / /
* | / Space OddityAkira Matsuda2016-01-143-4/+4
| |/ |/|
* | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-134-11/+13
* | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-134-2/+16
* | Merge pull request #23040 from rafaelfranca/or-error-messageMatthew Draper2016-01-132-7/+11
|\ \
| * | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-132-7/+11
|/ /
* | do not run in parallel on travisAaron Patterson2016-01-121-1/+5
* | Revert "Change `WhereClause#merge` to same named columns on diff tables"Sean Griffin2016-01-122-25/+13
* | remove `present?` callsAaron Patterson2016-01-121-4/+4
* | monkey patch `recycle!` on to controllers onceAaron Patterson2016-01-121-4/+4
* | Merge pull request #22935 from cllns/add-status-name-to-outputRafael França2016-01-125-17/+84
|\ \
| * | Add both HTTP Response Code and Type to assertion messagesSean Collins2016-01-125-17/+84
* | | Merge pull request #23035 from jkowens/fix-null-byteRafael França2016-01-122-1/+9
|\ \ \
| * | | Prevent attempt to serve a request with a null byteJordan Owens2016-01-122-1/+9
* | | | Change `WhereClause#merge` to same named columns on diff tablesSean Griffin2016-01-122-13/+25
* | | | Merge pull request #23034 from claudiob/fix-ac-param-as-jsonRafael França2016-01-122-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | AC::Parameters#at_json: restore Rails 4.2’s valueclaudiob2016-01-122-1/+8
* | | | bring back `TEST` env for `rake test`.Yves Senn2016-01-123-1/+21
|/ / /
* | | add migration versioning example to the changelog. [ci skip]Yves Senn2016-01-121-0/+8
* | | Merge pull request #23004 from matthewd/default-scope-stiMatthew Draper2016-01-127-19/+61
|\ \ \
| * | | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-124-3/+24
| * | | Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-123-16/+37
| | |/ | |/|
* | | Merge pull request #23020 from matthewd/frozen-headersMatthew Draper2016-01-123-1/+29
|\ \ \
| * | | Commit before freezing the headersMatthew Draper2016-01-123-1/+29
|/ / /
* | | Merge pull request #20762 from maurogeorge/record-not-found-docJon Moss2016-01-111-2/+6
|\ \ \
| * | | Add a note on ActionController guide about 404Mauro George2016-01-111-2/+6
* | | | Unneeded &block parametersAkira Matsuda2016-01-121-2/+2
|/ / /
* | | Merge pull request #23015 from schneems/schneems/manual-environment-setRichard Schneeman2016-01-112-6/+17
|\ \ \ | |/ / |/| |
| * | Allow manually setting environment valueschneems2016-01-112-6/+17
|/ /
* | Merge pull request #23003 from y-yagi/remove_warningsKasper Timm Hansen2016-01-111-2/+2
|\ \
| * | remove warnings from rake testyuuji.yaginuma2016-01-111-2/+2
* | | Merge pull request #22808 from y-yagi/do_not_clear_all_reportersKasper Timm Hansen2016-01-111-1/+2
|\ \ \ | |/ / |/| |
| * | delete only unnecessary reporteryuuji.yaginuma2016-01-111-1/+2
* | | Merge pull request #22998 from kamipo/extract_mysql_column_classSean Griffin2016-01-104-85/+97
|\ \ \
| * | | Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada...Ryuta Kamizono2016-01-113-29/+35
| * | | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-113-56/+62
* | | | Merge pull request #20638 from jaimeiniesta/locale-aware-pluralize-helperKasper Timm Hansen2016-01-102-17/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Pass the current locale to Inflector from the pluralize text helper.Jaime Iniesta2016-01-102-17/+36
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 16:45:59 +0000