aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19942 from earthrid/masterZachary Scott2015-04-281-4/+1
|\
| * RewordingKevin Busby2015-04-281-4/+1
|/
* Merge pull request #19917 from senny/preview_null_mailYves Senn2015-04-285-6/+55
|\
| * mailer previews for `NullMail` instances. Closes #19849.Yves Senn2015-04-285-6/+47
| * mailer previews, make sure labels and values line up.Yves Senn2015-04-282-0/+8
|/
* Merge pull request #19932 from axilleas/api_docs_guidelinesYves Senn2015-04-282-2/+7
|\
| * Update instructions to build guides locally [ci skip]Achilleas Pipinellis2015-04-282-2/+7
* | Merge pull request #19935 from eliotsykes/clarify-configuring-default-test-orderCarlos Antonio da Silva2015-04-281-1/+1
|\ \
| * | Clarify test_order default configuration behaviour [ci skip]Eliot Sykes2015-04-281-1/+1
* | | Merge pull request #19937 from tak1n/masterCarlos Antonio da Silva2015-04-281-2/+2
|\ \ \
| * | | fixed typoBenny Klotz2015-04-281-2/+2
* | | | Merge pull request #19931 from prathamesh-sonpatki/note-about-non-get-linksYves Senn2015-04-281-0/+3
|\ \ \ \
| * | | | Added note about non-GET links getting converted to GET links in mailer temp...Prathamesh Sonpatki2015-04-281-0/+3
* | | | | Merge pull request #19930 from axilleas/doc_smtp_plain_auth_fixYves Senn2015-04-281-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | AUTH PLAIN is Base64 encoded [ci skip]Achilleas Pipinellis2015-04-281-2/+2
| |/ / /
* | / / guides, bring back minitest assertion table. [ci skip]Yves Senn2015-04-281-3/+43
| |/ / |/| |
* | | Merge pull request #19907 from artofhuman/sneakers-updateYves Senn2015-04-282-8/+8
|\ \ \
| * | | Unlock sneakers adapter versionSemyon Pupkov2015-04-282-8/+8
* | | | Merge pull request #19546 from DianthuDia/fix_unscope_for_less_thanYves Senn2015-04-283-1/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix unscope for less thanTAKAHASHI Kazuaki2015-03-272-1/+13
* | | | Merge pull request #19718 from eagletmt/find_by-without-argYves Senn2015-04-283-4/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Raise ArgumentError when find_by receives no argumentsKohei Suzuki2015-04-112-4/+12
* | | | Merge pull request #19927 from prathamesh-sonpatki/request-forgery-docsYves Senn2015-04-281-5/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Updated request_forgery_protection docs [ci skip]Prathamesh Sonpatki2015-04-281-5/+6
|/ / /
* | | Merge pull request #19919 from piton4eg/patch-3Arthur Nogueira Neves2015-04-271-7/+7
|\ \ \
| * | | Small punctuation fixes [ci skip]Alexey Markov2015-04-271-7/+7
|/ / /
* | | remove trailing whitespace. [ci skip]Yves Senn2015-04-271-1/+1
* | | Merge pull request #19918 from vngrs/becomes_missing_note_about_stiYves Senn2015-04-271-1/+3
|\ \ \
| * | | Add note about sti column value to becomes method [ci skip]Mehmet Emin İNAÇ2015-04-271-2/+4
* | | | Add changelog for rake routes default fixArthur Neves2015-04-271-0/+7
* | | | Merge pull request #18392 from brainopia/fix_route_requirementsArthur Nogueira Neves2015-04-272-1/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Correct route requirements by overriding defaultls (fixes #18373)brainopia2015-01-082-1/+9
* | | | test, for `create_table` and `foreign_key: true` no-op. Closes #19794.Yves Senn2015-04-271-0/+20
* | | | Revert "Merge pull request #17920 from calebthompson/dont-rely-on-environment...Yves Senn2015-04-273-1/+36
* | | | nodoc private internal constants from ActiveJob::ArgumentsZachary Scott2015-04-261-0/+5
* | | | Don't document internal monkey patch for mysql gem [ci skip]Zachary Scott2015-04-261-1/+3
* | | | 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
|/ / / /