aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't document private internal constant [ci skip]Zachary Scott2015-04-261-0/+1
* Merge pull request #19911 from khundawg/dm-active-support-rescuable-rails-docZachary Scott2015-04-262-3/+3
|\
| * [ci skip] Update ActiveSupport::Rails and ActiveSupport::Rescuable docsDAVID MOORE2015-04-262-3/+3
* | Merge pull request #19904 from zzak/rm_route_wrapper_internal_hacksRafael Mendonça França2015-04-261-0/+16
|\ \ | |/ |/|
| * Remove internal hacks dependent on Sprockets from RouteWrapperZachary Scott2015-04-251-5/+1
| * Fix rake routes for api appsJorge Bejar2015-04-252-1/+21
* | Need to add config.assets.compile=true to access `.assets`Arthur Neves2015-04-261-0/+1
* | assets:cache:clean wont clean cache anymoreArthur Neves2015-04-261-11/+0
* | Use latest sprockets-rails on internal devArthur Neves2015-04-262-7/+15
* | Don't reference sprockets assets on action packArthur Neves2015-04-261-1/+1
* | Merge pull request #19909 from prathamesh-sonpatki/rm-unused-codeCarlos Antonio da Silva2015-04-261-17/+0
|\ \
| * | Removed unused code from request_forgery_protection testsPrathamesh Sonpatki2015-04-261-17/+0
|/ /
* | Merge pull request #19905 from prathamesh-sonpatki/no-readme-linkRafael Mendonça França2015-04-261-1/+1
|\ \ | |/ |/|
| * Escape README in Plugin builder API documentationPrathamesh Sonpatki2015-04-261-1/+1
|/
* Merge pull request #19884 from chancancode/uncomment-byebugGodfrey Chan2015-04-262-1/+5
|\
| * Uncomment byebug in framework GemfileGodfrey Chan2015-04-242-1/+5
* | Merge pull request #19902 from khundawg/dm-active-support-subsciber-docRichard Schneeman2015-04-251-2/+2
|\ \
| * | [ci skip] Update ActiveSupport::Subscriber documentationDAVID MOORE2015-04-251-2/+2
* | | Revert "Fix multiple suggestion test"Arthur Neves2015-04-251-1/+1
* | | Fix multiple suggestion testArthur Neves2015-04-251-1/+1
* | | Add test for multiple suggested generator names.Josef Šimánek2015-04-251-0/+6
* | | Merge pull request #19892 from derekprior/dp-translate-helper-docsZachary Scott2015-04-251-23/+36
|\ \ \
| * | | Correct translate helper docs [ci skip]Derek Prior2015-04-241-23/+36
* | | | Merge pull request #19899 from tgxworld/fix_docArthur Nogueira Neves2015-04-251-2/+2
|\ \ \ \
| * | | | No need to capitalize verbs. [CI SKIP]Guo Xiang Tan2015-04-261-2/+2
|/ / / /
* | | | Minor edits to the "Action View Overview" guideRobin Dupret2015-04-251-18/+13
* | | | :put_litter_in_its_place: Unused methodsAkira Matsuda2015-04-252-12/+0
* | | | :put_litter_in_its_place: Unused methodAkira Matsuda2015-04-251-6/+0
* | | | Why do we add a top-level constant here?Akira Matsuda2015-04-252-9/+5
* | | | Do not show --helper and --assets options in the controller generator helpAkira Matsuda2015-04-251-1/+2
* | | | Merge pull request #19894 from thenickcox/deprecated_proxy_docsZachary Scott2015-04-241-22/+38
|\ \ \ \
| * | | | [ci skip] Rework docs, add examples on deprecation proxiesNick Cox2015-04-241-22/+38
| |/ / /
* | | | Merge pull request #19236 from sshaw/more_tagged_logging_docsYves Senn2015-04-242-1/+4
|\ \ \ \
| * | | | Refer to the constructer argument in docsSkye Shaw2015-04-241-1/+1
| * | | | More docs on tagged logging [ci skip]sshaw2015-03-062-1/+4
* | | | | Merge pull request #19888 from imtayadeway/tw/attribute-methods-docsClaudio B.2015-04-241-7/+7
|\ \ \ \ \
| * | | | | Fix grammar/style: assigns/declares -> assignments/declarations.Tim Wade2015-04-241-3/+3
| * | | | | Fix grammar/style: use (v) fall back (on).Tim Wade2015-04-241-1/+1
| * | | | | Fix grammar/style: break up long sentence.Tim Wade2015-04-241-2/+2
| * | | | | Fix grammar/style: pluralize 'each of its method'Tim Wade2015-04-241-1/+1
| | |/ / / | |/| | |
* | | | | use a more descriptive example. [ci skip]Yves Senn2015-04-241-6/+4
* | | | | docs for `create_table` and non-int primary keys. [ci skip]Yves Senn2015-04-241-0/+17
|/ / / /
* | | | Merge pull request #19881 from sikachu/silence-mysql-errno-warningRafael Mendonça França2015-04-231-1/+3
|\ \ \ \
| * | | | Silence warning from MySQL::Error object in testPrem Sichanugrist2015-04-231-1/+3
|/ / / /
* | | | Merge pull request #19879 from bboe/RedirectTestCleanupRafael Mendonça França2015-04-231-3/+0
|\ \ \ \
| * | | | Remove unused WorkshopsController class in redirect_test.Bryce Boe2015-04-231-3/+0
* | | | | Remove nonexistent adapterRafael Mendonça França2015-04-231-1/+0
* | | | | Add nodoc to some private constants [ci skip]Rafael Mendonça França2015-04-231-3/+3
* | | | | Merge pull request #19823 from sbhatore/doc_fix_1Rafael Mendonça França2015-04-231-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Squashed commit of the following:Siddharth Bhatore2015-04-231-0/+8