aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20904 from kaspth/wildcard-template-dependenciesKasper Timm Hansen2015-07-279-12/+121
|\
| * Add wildcard template dependencies.Kasper Timm Hansen2015-07-269-12/+121
* | Encode the email address as prescribed in RFC 6068 section 2.Clayton Smith2015-07-232-1/+9
|/
* Merge pull request #20895 from brian-davis/brian-davisSean Griffin2015-07-201-1/+1
|\
| * grammar fix to content_for method documentation in capture_helper.rbBrian Davis2015-07-151-1/+1
* | Merge pull request #20384 from kaspth/per-request-cacheDavid Heinemeier Hansson2015-07-203-17/+19
|\ \
| * | Remove unused persistent option.Kasper Timm Hansen2015-07-181-3/+3
| * | Make digest cache work in development.Kasper Timm Hansen2015-07-183-14/+16
* | | Freeze string literals when not mutated.schneems2015-07-195-11/+11
* | | Stop using deprecated `render :text` in testPrem Sichanugrist2015-07-175-23/+25
* | | [skip ci] Lookup can be a noun but it is not a verbJon Atack2015-07-174-9/+10
| |/ |/|
* | Make AC::Parameters not inherited from HashPrem Sichanugrist2015-07-151-0/+10
* | Change AC::TestResponse to AD::TestResponsePrem Sichanugrist2015-07-142-2/+2
|/
* Merge pull request #20813 from noniq/locale-argument-for-pluralize-helperKasper Timm Hansen2015-07-092-2/+22
|\
| * Allow `pluralize` helper to take a locale.Stefan Daschek2015-07-092-2/+22
* | use new constructor. (Oops! :bomb:)Aaron Patterson2015-07-082-2/+2
* | Support explicit defintion of resouce name for collection caching.Dov Murik2015-07-075-9/+47
|/
* changes names in guides to better reflect diversity [ci-skip]Thomas Osborn2015-07-021-6/+6
* Merge pull request #20669 from akolomiychuk/image-pathYves Senn2015-06-293-0/+11
|\
| * Add nil check in asset_pathAnton Kolomiychuk2015-06-292-0/+7
* | Fix cache issue when different partials use the same collectionRoque Pinel2015-06-284-16/+36
* | Merge pull request #20417 from dubek/fix-template-cache-call-patternKasper Timm Hansen2015-06-263-1/+36
|\ \
| * | Improve detection of partial templates eligible for collection caching.Dov Murik2015-06-223-1/+36
* | | A few documentation fixes [ci skip]Robin Dupret2015-06-231-6/+6
|/ /
* | Merge pull request #20654 from repinel/remove-duplicate-privateRichard Schneeman2015-06-211-2/+0
|\ \
| * | Remove duplicate private statementRoque Pinel2015-06-211-2/+0
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-215-6/+6
|\ \ \ | |/ / |/| |
| * | [ci skip] Fix to Fixed-width Fontyui-knk2015-06-143-4/+4
| * | [ci skip] Add '.'yui-knk2015-06-141-1/+1
| * | [ci skip] Fix minutes to seconds in `select_second`yui-knk2015-06-091-1/+1
* | | applies project style guidelinesXavier Noria2015-06-201-7/+7
* | | removes unnecessary backslashes in regexpsXavier Noria2015-06-201-3/+3
| |/ |/|
* | Nitpick :nail_care: [ci skip]Zachary Scott2015-06-181-1/+2
* | Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdocZachary Scott2015-06-181-0/+20
|\ \
| * | Add RDoc about scope option on distance_of_time_in_wordsMauro George2015-06-181-0/+20
* | | Merge pull request #20108 from akshay-vishnoi/button-tagArthur Nogueira Neves2015-06-152-2/+22
|\ \ \
| * | | Add missing spec and documentation for button_tag helperAkshay Vishnoi2015-05-242-2/+22
* | | | Merge pull request #20107 from ankit8898/av_refac_record_tag_helperArthur Nogueira Neves2015-06-151-2/+1
|\ \ \ \
| * | | | Removed not needed includes, As record_tag_helper is moved to a gem we are notAnkit Gupta2015-05-101-2/+1
| |/ / /
* | | | Merge pull request #20548 from maurogeorge/collection_check_boxes-rdoc-gotchaZachary Scott2015-06-141-0/+21
|\ \ \ \
| * | | | Add gotcha to RDoc of collection_check_boxesMauro George2015-06-131-0/+21
| | |/ / | |/| |
* / | | Revert "revises a test to account for case-insensitive file systems"Matthew Draper2015-06-141-18/+2
|/ / /
* | | Merge pull request #20480 from senny/test_runnerYves Senn2015-06-121-0/+4
|\ \ \
| * | | select the AR adapter through `bin/test`.Yves Senn2015-06-111-0/+1
| * | | use our runner (`bin/test`) for framework components.Yves Senn2015-06-111-0/+3
* | | | Merge pull request #20058 from farukaydin/cache-digests-dependency-rakeRafael Mendonça França2015-06-112-1/+22
|\ \ \ \
| * | | | add error log that notify 'file not found' when using cache_digests:dependenc...Faruk AYDIN2015-05-072-1/+22
* | | | | Exclude cache_digests:dependencies rake task in api appJorge Bejar2015-06-111-2/+4
| |/ / / |/| | |
* | | | Tiny documentation edits [ci skip]Robin Dupret2015-06-091-7/+7
* | | | Raise an ArgumentError when `include_blank` is false for a required field inGrey Baker2015-06-083-3/+21