aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
* | | | | | | | | | | Merge pull request #21530 from arvindmehra/am-ar-to-activerecordYves Senn2015-09-084-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace AR with ActiveRecord to make it more readable [ci skip]arvind2015-09-084-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #21528 from yui-knk/test/add_tests_for_mysql2_viewYves Senn2015-09-082-64/+66
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add view tests for MySQLyui-knk2015-09-082-64/+66
* | | | | | | | | | | Merge pull request #21519 from y-yagi/test_runner_raise_errorKasper Timm Hansen2015-09-084-7/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | modify to pass the correct argument to the test runner from rakeyuuji.yaginuma2015-09-082-6/+15
| * | | | | | | | | | | raise LoadError when a non-existent file or directory is specified to the tes...yuuji.yaginuma2015-09-072-1/+6
* | | | | | | | | | | | :bomb:Rafael Mendonça França2015-09-081-1/+1
* | | | | | | | | | | | Memoized reflections accessorRafael Mendonça França2015-09-081-9/+18
* | | | | | | | | | | | Merge pull request #21537 from tgxworld/perf_reduce_allocationRafael Mendonça França2015-09-071-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reduce allocation in `resolve_column_aliases`.Guo Xiang Tan2015-09-081-5/+5
* | | | | | | | | | | | | Merge pull request #21520 from jeremy/friendlier-force-sslJeremy Daer (Kemper)2015-09-073-200/+252
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make `config.force_ssl` less dangerous to try and easier to disableJeremy Daer2015-09-073-200/+252
* | | | | | | | | | | | | | Merge pull request #21536 from jeremy/support-mysql2-0.4.0Jeremy Daer (Kemper)2015-09-073-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Support mysql2 0.4.0, first release with prepared statements supportJeremy Daer2015-09-073-4/+9
|/ / / / / / / / / / / / /
* | | | | | / / / / / / / .gitignore: Ignore .ruby-version in any subdirJeremy Daer2015-09-071-3/+3
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Use Hash[] instead of Hash#dup in resolve_column_aliasesRafael Mendonça França2015-09-071-1/+3
* | | | | | | | | | | | Merge pull request #21534 from Vratislav/clarify-custom-config-guideRafael Mendonça França2015-09-071-1/+1
* | | | | | | | | | | | Revert "Merge pull request #21069 from dmitry/feature/validate-multiple-conte...Rafael Mendonça França2015-09-075-50/+2
* | | | | | | | | | | | Merge pull request #21069 from dmitry/feature/validate-multiple-contexts-at-onceRafael Mendonça França2015-09-075-2/+50
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Validate multiple contexts on `valid?` and `invalid?` at once.Dmitry Polushkin2015-07-305-2/+50
* | | | | | | | | | | | | Merge pull request #21522 from tgxworld/scope_perfRafael Mendonça França2015-09-074-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Cache check if `default_scope` has been overridden.Guo Xiang Tan2015-09-071-1/+8