aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | put dynamic matchers on the GeneratedAssociationMethods instead of modelRob Looby2015-05-083-3/+24
* | | | | | | Merge pull request #21554 from ronakjangir47/added_nodocRafael Mendonça França2015-09-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Added nodoc for `arel` method which returns object of private api. [ci skip]Ronak Jangir2015-09-091-1/+1
* | | | | | | | Merge pull request #20921 from pboling/fix-sql-colors-in-log-subscriberRafael Mendonça França2015-09-093-8/+126
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extraneous `then` from case statementPeter Boling2015-07-172-14/+39
| * | | | | | | | Improve sql logging coloration in `ActiveRecord::LogSubscriber`.Peter Boling2015-07-174-8/+144
* | | | | | | | | Merge pull request #21560 from ravindrakumawat/american-styleRafael Mendonça França2015-09-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rails documentation use american english.[ci skip]ravindra kumar kumawat2015-09-091-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21559 from claudiob/timestamp-docClaudio B.2015-09-081-5/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix docs of AR::Timestamp to match #15726claudiob2015-09-081-5/+12
|/ / / / / / / /
* | | | | | | | ensure that mutating headers will impact the content_type methodAaron Patterson2015-09-081-0/+5
* | | | | | | | mime_type will always return a stringAaron Patterson2015-09-081-2/+1
* | | | | | | | remove `parse_content_type` parameterAaron Patterson2015-09-081-6/+7
* | | | | | | | avoid allocations when there is no content type setAaron Patterson2015-09-081-1/+2
* | | | | | | | handle implicit rendering correctlyAaron Patterson2015-09-081-3/+4
* | | | | | | | remove mime type lookups when parsing the content typeAaron Patterson2015-09-081-5/+5
* | | | | | | | refactor content type settingAaron Patterson2015-09-081-44/+39
* | | | | | | | make Content-Type header the canonical location for content-type infoAaron Patterson2015-09-081-34/+50
* | | | | | | | pull content type parsing in to a methodAaron Patterson2015-09-081-7/+15
* | | | | | | | ensure that content type defaults to text / html when setting charsetAaron Patterson2015-09-081-0/+7
* | | | | | | | push content_type assigment in to metalAaron Patterson2015-09-083-9/+11
* | | | | | | | avoid useless string allocationsAaron Patterson2015-09-082-2/+1
* | | | | | | | use accessors instead of manipulating the hashAaron Patterson2015-09-081-2/+2
* | | | | | | | Merge pull request #21518 from codebaker95/activejob_logging_fixKasper Timm Hansen2015-09-082-1/+23
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Properly log nested parameters to Active JobMarek Pieczyk2015-09-082-1/+23
|/ / / / / / /
* | | | | | | Merge pull request #21556 from artofhuman/masterRafael Mendonça França2015-09-081-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in activemodel changelogSemyon Pupkov2015-09-081-4/+4
* | | | | | | | Push key_generator into SerializedCookieJarsKasper Timm Hansen2015-09-081-4/+4
* | | | | | | | Move the request method in to the AbstractCookieJarKasper Timm Hansen2015-09-081-4/+3
* | | | | | | | Pull up parse to the legacy upgrading moduleKasper Timm Hansen2015-09-081-10/+5
* | | | | | | | Call super to remove the decrypt_and_verify methodKasper Timm Hansen2015-09-081-8/+4
* | | | | | | | Call super to remove the verify methodKasper Timm Hansen2015-09-081-8/+2
* | | | | | | | Add parse method to share deserialization logic.Kasper Timm Hansen2015-09-081-19/+12
* | | | | | | | Add commit in the EncryptedCookieJarKasper Timm Hansen2015-09-081-17/+7
* | | | | | | | Use commit in the SignedCookieJarKasper Timm Hansen2015-09-081-15/+6
* | | | | | | | Add commit method to share option normalizationKasper Timm Hansen2015-09-081-4/+12
* | | | | | | | Add AbstractCookieJar class.Kasper Timm Hansen2015-09-081-1/+3
|/ / / / / / /
* | | | | | | Use released mysql2Rafael Mendonça França2015-09-082-8/+3
* | | | | | | Merge pull request #21502 from bernerdschaefer/bs-polymorphic-url_for-dups-ar...Rafael Mendonça França2015-09-086-3/+47
|\ \ \ \ \ \ \
| * | | | | | | `url_for` does not modify polymorphic optionsBernerd Schaefer2015-09-046-3/+47
* | | | | | | | Merge pull request #21552 from ronakjangir47/fixed_docsRichard Schneeman2015-09-081-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fixed Time conversion example for UTC time zone [ci skip]Ronak Jangir2015-09-081-1/+1
* | | | | | | | Merge pull request #21535 from dmitry/feature/validate-multiple-contextsRafael Mendonça França2015-09-085-2/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Validate multiple contexts on `valid?` and `invalid?` at once.Dmitry Polushkin2015-09-075-2/+50
* | | | | | | | | Merge pull request #21512 from X0nic/guides-clarify-timeout-errorYves Senn2015-09-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | [Rails Guides] clarify `ActiveRecord::ConnectionTimeoutError`Nathan Lee2015-09-051-1/+1
* | | | | | | | | Merge pull request #21511 from rwz/ar-exceptions-no-argsEileen M. Uchitelle2015-09-085-66/+178
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make ActiveRecordException descendants args optionalPavel Pravosud2015-09-075-66/+178
* | | | | | | | | | Merge pull request #21548 from yui-knk/feature/define_tables_as_interfaceYves Senn2015-09-081-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Define `SchemaStatements#tables` as interfaceyui-knk2015-09-081-0/+6