aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prep Rails 5 beta 4eileencodes2016-04-2722-49/+71
* Fix release script to allow pre release gemseileencodes2016-04-271-1/+1
* Respect gospel of Railties Gods: no on_load with after.Kasper Timm Hansen2016-04-271-3/+1
* Revert "Change 1.week to create 1 week durations instead of 7 days durations."Jeremy Daer2016-04-274-34/+11
* Merge pull request #24752 from lsylvester/collection_caching-after-set_configsKasper Timm Hansen2016-04-271-1/+1
|\
| * make the collection_caching initializer run after the Action Controller confi...Lachlan Sylvester2016-04-271-1/+1
|/
* Merge pull request #24747 from Erol/fix-configuration-guide-typoJon Moss2016-04-261-1/+1
|\
| * Fix typo in Configuration Guide [ci skip]Erol Fornoles2016-04-271-1/+1
|/
* Add more info to insecure URL generation errorDerek Prior2016-04-264-4/+12
* Merge pull request #24723 from lvl0nax/array_split_fixJeremy Daer2016-04-262-10/+14
|\
| * Little perfomance fix for Array#split.lvl0nax2016-04-262-10/+14
* | Merge pull request #24737 from Erol/fix-guides-typoRichard Schneeman2016-04-261-1/+1
|\ \
| * | Fix typo in Rails Guides [ci skip]Erol Fornoles2016-04-261-1/+1
|/ /
* | Clear ActionMailer deliveries on setup and teardownarktisklada2016-04-252-1/+42
* | Merge pull request #24641 from rafaelfranca/fix-per-form-token-with-full-urlJeremy Daer2016-04-252-1/+15
|\ \
| * | Discart the schema and host information when building the per-form tokenRafael Mendonça França2016-04-202-1/+15
* | | Do not cache ActiveSupport::TimeZone#utc_offsetAlexey Shein2016-04-253-3/+18
* | | CI: allow JRuby build to fail, too flaky to be usefulJeremy Daer2016-04-251-0/+1
* | | Merge pull request #24730 from vipulnsward/move-savepointsRafael França2016-04-252-4/+4
|\ \ \
| * | | Move remaining current_savepoint_name to savepoints moduleVipul A M2016-04-252-4/+4
| | |/ | |/|
* | | Merge pull request #24731 from vipulnsward/database-typeSean Griffin2016-04-253-1/+16
|\ \ \
| * | | Dont simply assume a type is a valid database type. This is only always true ...Vipul A M2016-04-253-1/+16
| |/ /
* | | Merge pull request #24729 from Fryguy/date_and_time_depends_on_mattr_accessorAndrew White2016-04-251-0/+2
|\ \ \ | |/ / |/| |
| * | Add require of mattr_accessor since Compatibility relies on it.Jason Frey2016-04-251-0/+2
|/ /
* | Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-254-5/+24
|\ \
| * | register rake options to `OptionParser`yuuji.yaginuma2016-04-252-0/+14
| * | remove unnessary option setting from test runneryuuji.yaginuma2016-04-252-5/+10
* | | Remove `Array#sum` method before override ityui-knk2016-04-241-0/+2
* | | Merge pull request #23103 from rails/refactor-handling-of-action-defaultJeremy Daer2016-04-248-33/+73
|\ \ \
| * | | Refactor handling of :action default in routingAndrew White2016-02-168-32/+74
* | | | Add Expression Indexes and Operator Classes support for PostgreSQLRyuta Kamizono2016-04-2410-38/+112
* | | | remove_index do not fetch indexes if name is specifiedSeva Orlov2016-04-243-1/+23
* | | | Follow up of #23461Vipul A M2016-04-244-6/+8
* | | | rewords code comment [ci skip]Xavier Noria2016-04-241-3/+3
* | | | removes useless use of string interpolationXavier Noria2016-04-241-2/+2
* | | | Include the Savepoints module in all adapters.Vipul A M2016-04-247-17/+10
* | | | Share lock: more accurate livelock fix for aa598f4Jeremy Daer2016-04-241-3/+2
* | | | Merge pull request #24715 from vipulnsward/nodoc-st-poolKasper Timm Hansen2016-04-241-1/+1
|\ \ \ \
| * | | | :nodoc: internal StatementPool class.Vipul A M2016-04-241-1/+1
* | | | | Merge pull request #24712 from vipulnsward/23461-release-notesKasper Timm Hansen2016-04-241-3/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add #23461 to release notesVipul A M2016-04-241-3/+8
|/ / / /
* | | | Merge pull request #24710 from prathamesh-sonpatki/fix-buildKasper Timm Hansen2016-04-241-2/+2
|\ \ \ \
| * | | | Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2
|/ / / /
* | | | Merge pull request #24709 from y-yagi/add_channels_files_in_stats_taskJeremy Daer2016-04-231-0/+1
|\ \ \ \
| * | | | add channels files in `stats` taskyuuji.yaginuma2016-04-241-0/+1
* | | | | Merge pull request #23461 from kamipo/prepared_statements_for_mysql2_adapterJeremy Daer2016-04-236-60/+165
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2016-04-216-61/+164
* | | | | Merge pull request #24701 from prathamesh-sonpatki/deprecate-request_via_redi...Guillermo Iguaran2016-04-242-8/+11
|\ \ \ \ \
| * | | | | Deprecate `request_via_redirect` method.Prathamesh Sonpatki2016-04-242-8/+11
* | | | | | Merge pull request #24708 from kamipo/move_select_rows_implementation_to_supe...Jeremy Daer2016-04-232-5/+1
|\ \ \ \ \ \