aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24762 from Envek/solid_durations_2Andrew White2016-04-294-11/+47
|\
| * Change 1.week to create 1 week durations instead of 7 days durations.Andrey Novikov2016-04-284-11/+47
* | Merge pull request #24781 from maclover7/rm-envGuillermo Iguaran2016-04-283-12/+39
|\ \
| * | Remove last uses of `@env[]` and `@env[]=`Jon Moss2016-04-283-12/+39
* | | Merge pull request #24653 from kbrock/kinder_locking_columnRafael França2016-04-282-1/+54
|\ \ \
| * | | test the number of times the schema is loadingKeenan Brock2016-04-281-0/+53
| * | | schema_load triggers 2nd schema_load (via locking)Keenan Brock2016-04-281-1/+1
|/ / /
* | | Merge pull request #24770 from vipulnsward/guieds-typeRafael França2016-04-281-1/+1
|\ \ \ | |/ / |/| |
| * | Pass over debugging guideVipul A M2016-04-281-1/+1
* | | Merge pull request #24772 from javiervidal/broken_links_ryandaigleKasper Timm Hansen2016-04-282-14/+14
|\ \ \ | |/ / |/| |
| * | Fix broken links to ryandaigle.com [ci skip]Javier Vidal2016-04-282-14/+14
|/ /
* | Merge pull request #24764 from deivid-rodriguez/review_debugging_guideVipul A M2016-04-281-140/+185
|\ \
| * | Review the `byebug` debugging guideDavid Rodríguez2016-04-281-140/+185
|/ /
* | Merge pull request #24765 from ralinchimev/fix-inconsistencies-in-rails-docum...Vipul A M2016-04-281-4/+4
|\ \
| * | Fix inconsistent usage of capital letter in rails generate command examplesRalin Chimev2016-04-281-4/+4
|/ /
* | Merge pull request #24761 from rubys/patch-3Richard Schneeman2016-04-271-1/+1
|\ \ | |/ |/|
| * Update to the Rails 5 version of the bookSam Ruby2016-04-271-1/+1
|/
* Merge pull request #24759 from vipulnsward/push-initilizer-to-endRafael França2016-04-271-4/+4
|\
| * Push action_view.collection_caching to be called towards the end, since it de...Vipul A M2016-04-281-4/+4
|/
* 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