aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update deprecation_horizon to 5.1 from 5.0 [ci skip]Ryuta Kamizono2016-01-141-3/+3
* 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
* | | | Merge pull request #22833 from sivagollapalli/test_runner_with_multiple_linesKasper Timm Hansen2016-01-103-4/+87
|\ \ \ \
| * | | | Added multiple line filters support for test runnerSiva Gollapalli2016-01-103-4/+87
* | | | | Merge pull request #21181 from denisenkom/mypatchKasper Timm Hansen2016-01-101-0/+19
|\ \ \ \ \
| * | | | | Test basic auth with symbols in login and passwordMikhail Denisenko2015-10-241-0/+19
* | | | | | Merge pull request #22983 from bronson/update-mysql-in-guidesSantiago Pastorino2016-01-102-2/+1
|\ \ \ \ \ \
| * | | | | | remove legacy mysql from guides to match #22715Scott Bronson2016-01-092-2/+1
* | | | | | | Merge pull request #21995 from tak1n/masterJon Moss2016-01-101-8/+35
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix doc for rails custom configuration through config_for [skip ci]Benny Klotz2015-12-031-2/+2
| * | | | | | Updated existing custom configuration for rails 5 where `config.x`Benny Klotz2015-10-191-8/+35
* | | | | | | Merge pull request #22993 from akshay-vishnoi/travis-updateMatthew Draper2016-01-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update postgresql version to 9.4 for travis.Akshay Vishnoi2016-01-101-1/+1
* | | | | | | | Merge pull request #22992 from akshay-vishnoi/fix-docsSean Griffin2016-01-092-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 04:41:19 +0000