aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix typo `--ssl-cipher`Ryuta Kamizono2016-03-061-1/+1
* Merge pull request #24081 from y-yagi/remove_entry_for_reverted_commitRafael França2016-03-051-3/+0
|\
| * remove entry for reverted commit [ci skip]yuuji.yaginuma2016-03-061-3/+0
|/
* Merge pull request #24079 from y-yagi/chage_date_time_to_datetimeSean Griffin2016-03-051-1/+1
|\
| * chage `date_time` type ` to `datetime`yuuji.yaginuma2016-03-061-1/+1
* | Merge pull request #24080 from y-yagi/make_attributes_api_example_to_workRafael França2016-03-051-2/+2
|\ \
| * | make attributes API example to work [ci skip]yuuji.yaginuma2016-03-061-2/+2
|/ /
* / Update the rendering guide to match the current behaviorRafael Mendonça França2016-03-051-10/+9
|/
* Revert "Merge pull request #22764 from stevenspiel/titleize_model_name_for_de...Rafael Mendonça França2016-03-053-44/+3
* Merge pull request #24070 from y-yagi/remove_unnecessary_config_in_sprockets-...Rafael França2016-03-054-15/+2
|\
| * remove config that are no longer needed in sprockets-rails 3yuuji.yaginuma2016-03-054-15/+2
* | Merge pull request #24072 from byroot/remove-http-cache-forever-versionRafael França2016-03-052-13/+3
|\ \
| * | Remove http_cache_forever's version parameterJean Boussier2016-03-052-13/+3
| |/
* | Merge pull request #24075 from y-yagi/fix_typoSean Griffin2016-03-051-1/+1
|\ \
| * | fix typo in attribute example [ci skip]yuuji.yaginuma2016-03-051-1/+1
|/ /
* | Merge pull request #24074 from meinac/small_doc_fixAndrew White2016-03-051-1/+1
|\ \
| * | A small documentation fix about autosave associations [ci skip]Mehmet Emin İNAÇ2016-03-051-1/+1
| |/
* / define APP_PATH with __dir__Xavier Noria2016-03-051-1/+1
|/
* Merge pull request #24069 from kamipo/fix_indentationArun Agrawal2016-03-051-1/+1
|\
| * Fix indentation [ci skip]Ryuta Kamizono2016-03-051-1/+1
* | Merge pull request #24068 from y-yagi/remove_outdated_commentArun Agrawal2016-03-051-6/+0
|\ \ | |/ |/|
| * remove outdated comment [ci skip]yuuji.yaginuma2016-03-051-6/+0
|/
* Merge pull request #24064 from rubys/guides_puma3_startRafael França2016-03-043-8/+8
|\
| * Match Puma 3 startup messages [ci skip]Sam Ruby2016-03-043-8/+8
* | start hiding the `scope_chain` data structureAaron Patterson2016-03-042-1/+11
|/
* Merge pull request #24061 from perceptec/update-engines-guideEileen M. Uchitelle2016-03-041-3/+3
|\
| * Fix author callback in engines guide [ci skip]Michael Ryan2016-03-041-3/+3
* | We're not using $2 from this RegexpAkira Matsuda2016-03-051-1/+1
* | don't build the reflection chain to calculate `nested?`Aaron Patterson2016-03-041-1/+9
|/
* remove useless ivarAaron Patterson2016-03-041-1/+0
* Merge pull request #24053 from mohitnatoo/rails-dev-cacheKasper Timm Hansen2016-03-041-1/+1
|\
| * - using rails dev:cache instead of rake dev:cache in test caseMohit Natoo2016-03-041-1/+1
* | Merge pull request #24050 from mohitnatoo/rails-routes-railtiesKasper Timm Hansen2016-03-041-7/+7
|\ \
| * | making a test definition more clear.Mohit Natoo2016-03-041-1/+1
| * | [ci skip] using correcting test case names specifying `rails routes` instead ...Mohit Natoo2016-03-041-6/+6
| |/
* | Merge pull request #24057 from javan/actioncable-return-subscriptionJeremy Daer2016-03-041-3/+4
|\ \
| * | Return subscription object(s) when updating the collectionJavan Makhmali2016-03-041-3/+4
|/ /
* | Merge pull request #24056 from lifo/cable-create-subscriptions-fixJeremy Daer2016-03-041-0/+2
|\ \
| * | Make sure ActionCable.Subscriptions#create always returns the newly created s...Pratik Naik2016-03-041-0/+2
|/ /
* | Merge pull request #24052 from bquorning/partial-rendering-with-collection-an...Akira Matsuda2016-03-043-1/+7
|\ \
| * | Fix partial rendering with dot in filenameBenjamin Quorning2016-03-043-1/+7
|/ /
* | Merge pull request #24049 from mohitnatoo/railties-run-manuallyप्रथमेश Sonpatki2016-03-041-2/+1
|\ \ | |/ |/|
| * [ci skip] correcting sentence in description of application.rbMohit Natoo2016-03-041-2/+1
|/
* Merge pull request #24045 from Sarah-Alsinan/patch-4Kasper Timm Hansen2016-03-041-1/+1
|\
| * Update base.rbSarah A2016-03-031-1/+1
|/
* Merge pull request #24042 from Sarah-Alsinan/patch-3Arun Agrawal2016-03-041-1/+1
|\
| * Update GemfileSarah A2016-03-031-1/+1
|/
* Merge pull request #24039 from javan/actioncable-cleanupJeremy Daer2016-03-036-22/+24
|\
| * Store reference to Subscriptions instance for convenienceJavan Makhmali2016-03-031-5/+6
| * Implicity add Subscription instance to subscriptions collectionJavan Makhmali2016-03-032-13/+12