aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #19339 from y-yagi/mailer_preview_commentAndrew White2015-03-152-7/+7
|\ \ \
| * | | add mailer suffix to comments for email previewsyuuji.yaginuma2015-03-152-7/+7
* | | | Merge pull request #19340 from keepcosmos/association-doc-fixClaudio B.2015-03-151-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Doc fix about association hierarchykeepcosmos2015-03-151-2/+2
|/ / /
* | | Merge pull request #19336 from tchandy/cleaning_actionview_testsCarlos Antonio da Silva2015-03-146-77/+1
|\ \ \
| * | | Cleaning JavaScriptHelperTestThiago Pradi2015-03-141-8/+1
| * | | Cleaning unused views from actionpack tests inside actionviewThiago Pradi2015-03-141-1/+0
| * | | Zlib isn't required for AssetTagHelperTest anymoreThiago Pradi2015-03-141-1/+0
| * | | Cleaning unused methods from abstract_unitThiago Pradi2015-03-141-57/+0
| * | | Deleting unused fixturesThiago Pradi2015-03-142-10/+0
* | | | Merge pull request #19337 from mnaberez/fix-actionpack-changelog-typoArun Agrawal2015-03-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in Action Pack changelog. [ci skip]Mike Naberezny2015-03-141-1/+1
|/ / /
* | | Merge pull request #19335 from JahBrewski/masterArthur Nogueira Neves2015-03-141-1/+1
|\ \ \
| * | | [ci skip] Subject-verb agreementJoel Brewer2015-03-141-1/+1
|/ / /
* | | Fix before_commit when updating a record on the callbackArthur Neves2015-03-142-23/+44
* | | Merge pull request #19322 from AndrewHendrie/AndrewHendrie-guides-testing-par...Rafael Mendonça França2015-03-131-1/+1
|\ \ \
| * | | Asserting partials modificationAndrew Hendrie2015-03-131-1/+1
* | | | Merge pull request #19323 from naoty/rake_initializerRafael Mendonça França2015-03-133-0/+14
|\ \ \ \
| * | | | Add `rake initializer`Naoto Kaneko2015-03-143-0/+14
* | | | | Added missing closing brace in sample code for safe HTML translationsChristian Ress2015-03-131-1/+1
* | | | | Merge pull request #19291 from hired/return-truthy-value-from-headRafael Mendonça França2015-03-132-0/+13
|\ \ \ \ \
| * | | | | Return true from head methodJoel Hayhurst2015-03-122-0/+13
| | |_|/ / | |/| | |
* | | | | Merge pull request #19311 from square/aj-adapter-lookupRafael Mendonça França2015-03-132-5/+9
|\ \ \ \ \
| * | | | | `QueueAdapters` does the lookupTamir Duberstein2015-03-122-5/+9
* | | | | | Merge pull request #19315 from josh/update-sprockets-linksRafael Mendonça França2015-03-136-10/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update sprockets links to point to rails orgJoshua Peek2015-03-136-10/+10
|/ / / / /
* | | | | Merge pull request #19317 from kuldeepaggarwal/doc-select-tag-outputAbdelkader Boudih2015-03-131-15/+15
|\ \ \ \ \
| * | | | | [ci skip] correct output of selectKuldeep Aggarwal2015-03-131-15/+15
|/ / / / /
* | | | | Merge pull request #19313 from akshay-vishnoi/options-docsRafael Mendonça França2015-03-121-5/+5
|\ \ \ \ \
| * | | | | [CI SKIP] Correct output of options_for_selectAkshay Vishnoi2015-03-131-5/+5
|/ / / / /
* | | | | Merge pull request #19312 from mariusbutuc/fix-mailer-testing-typoRafael Mendonça França2015-03-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo in the “Testing Your Mailers” docsMarius Butuc2015-03-121-1/+1
|/ / / /
* | | | Merge pull request #19309 from f1sherman/dont-set-session-options-idGuillermo Iguaran2015-03-125-13/+5
|\ \ \ \
| * | | | Use request.session.id instead of request.session_options[:id]Brian John2015-03-125-13/+5
| |/ / /
* | | | Merge pull request #19310 from square/aj-const-getArthur Nogueira Neves2015-03-121-1/+1
|\ \ \ \
| * | | | Use a more conservative `const_get` over `constantize`Tamir Duberstein2015-03-121-1/+1
* | | | | Merge pull request #19271 from eagletmt/304-content-typeArthur Nogueira Neves2015-03-122-0/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Also skip Content-Encoding and Vary header if 304Kohei Suzuki2015-03-122-4/+6
| * | | | 304 response should not include Content-Type headerKohei Suzuki2015-03-102-1/+12
* | | | | Merge pull request #19308 from yui-knk/fix/doc_noteAbdelkader Boudih2015-03-121-1/+4
|\ \ \ \ \
| * | | | | [ci skip] Take NOTE: as paragraph to make NOTE blockyui-knk2015-03-121-1/+4
|/ / / / /
* | | | | Merge pull request #19301 from Empact/default-scopesCarlos Antonio da Silva2015-03-126-19/+20
|\ \ \ \ \
| * | | | | Isolate access to .default_scopes in ActiveRecord::Scoping::DefaultBen Woosley2015-03-126-19/+20
* | | | | | Use `def setup` instead of `setup do`eileencodes2015-03-121-2/+4
* | | | | | Merge pull request #19303 from y-yagi/travel_to_docAbdelkader Boudih2015-03-121-9/+11
|\ \ \ \ \ \
| * | | | | | add `DateTime.now` to list of `TimeHelpers#travel_to` stubbing [ci skip]yuuji.yaginuma2015-03-121-9/+11
|/ / / / / /
* | | | | | Merge pull request #19299 from mattbrictson/pg-ruby-22Yves Senn2015-03-122-2/+7
|\ \ \ \ \ \
| * | | | | | Require pg~>0.18 to ensure Ruby 2.2 compatibilityMatt Brictson2015-03-112-2/+7
| |/ / / / /
* | | | | | Merge pull request #16992 from square/configurable-job-queue-adapterJeremy Kemper2015-03-124-17/+82
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | `ActiveJob::Base#queue_adapter` is now a `class_attribute`Tamir Duberstein2015-03-114-17/+82