aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-297-46/+93
|\
| * No need to sort testsAkira Matsuda2014-08-281-1/+1
| * remove useless parameterAaron Patterson2014-08-271-2/+2
| * remove dead codeAaron Patterson2014-08-271-12/+2
| * minor changelog formatting changes.Yves Senn2014-08-271-3/+3
| * Merge pull request #16488 from agrobbin/form-label-builderJeremy Kemper2014-08-253-22/+62
| |\
| | * provide a builder for form labels to customize wrapping around I18n contentAlex Robbin2014-08-203-22/+62
| * | Merge pull request #16639 from agrobbin/input-placeholder-i18nJeremy Kemper2014-08-245-0/+231
| |\ \
| | * | just use the placeholder tag value if it is passed as a StringAlex Robbin2014-08-222-5/+22
| | * | add I18n support for `:placeholder` HTML option is passed to form fieldsAlex Robbin2014-08-225-0/+214
| * | | Remove erroneous form_tag option docsT.J. Schuck2014-08-221-1/+0
| * | | Clarify that unknown keys will become HTML attrsT.J. Schuck2014-08-221-0/+1
| |/ /
| * / Revert "Add I18n support for `:placeholder` HTML option is passed to form fie...Jeremy Kemper2014-08-215-214/+0
| |/
* / Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Use released rails-deprecated_sanitizerRafael Mendonça França2014-08-191-1/+1
* Fix the rails-dom-testing dependecyRafael Mendonça França2014-08-191-0/+1
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-197-18/+18
|\
| * Uppercase HTML in docs.Hendy Tanata2014-08-088-19/+19
* | Removed warningRafael Mendonça França2014-08-181-1/+1
* | Fix assertion to map the behaviour of the old sanitizerRafael Mendonça França2014-08-181-1/+1
* | Merge pull request #15889 from carnesmedia/model-nameRafael Mendonça França2014-08-174-6/+6
|\ \
| * | Use #model_name on instances instead of classesAmiel Martin2014-06-244-6/+6
* | | Merge branch 'master' into loofahRafael Mendonça França2014-08-179-9/+219
|\ \ \
| * | | Remove usafe of respond_to in ActionView testsJosé Valim2014-08-171-3/+1
| * | | Perf optimization for `url_for` called w/ Hashschneems2014-08-141-1/+3
| * | | Merge pull request #16438 from agrobbin/input-placeholder-i18nJeremy Kemper2014-08-145-0/+214
| |\ \ \
| | * | | add I18n support for `:placeholder` HTML option is passed to form fieldsAlex Robbin2014-08-125-0/+214
| * | | | Missing ActiveSupport require for calling String#firstAkira Matsuda2014-08-141-0/+1
| * | | | AM, AP, AV, and AMo tests are already order_independent!Akira Matsuda2014-08-131-5/+0
| |/ / /
* | | | Prepare for partial release.Kasper Timm Hansen2014-08-173-34/+9
* | | | Merge branch 'master' into loofahRafael Mendonça França2014-08-1228-164/+344
|\| | |
| * | | Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-121-1/+1
| * | | users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-121-0/+5
| * | | defined? should actually work in current implementationAkira Matsuda2014-08-071-9/+0
| * | | Fixed #select form builder helper to support block with html outputBogdan Gusiev2014-08-052-1/+14
| | |/ | |/|
| * | Properly assert for the expected messagesCarlos Antonio da Silva2014-07-301-4/+8
| * | don't access named routes internalsAaron Patterson2014-07-301-1/+1
| * | Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-301-2/+3
| * | docs, cleanup mixed indents within `form_options_helper.rb` RDoc.Yves Senn2014-07-291-81/+81
| * | Fix that render layout should also be picked up by the template dependency tr...David Heinemeier Hansson2014-07-253-4/+29
| * | Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
| |\ \
| | * | Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
| * | | adding missing test for text area value before type castEugene Gilburg2014-07-191-0/+7
| * | | adding missing test coverageEugene Gilburg2014-07-181-0/+12
| * | | marking private methods which dont work if called on their own anywaysEugene Gilburg2014-07-182-1/+5
| * | | small refactors to actionview renderersEugene Gilburg2014-07-183-16/+15
| * | | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-5/+5
| * | | docs, `select` and friends with `multiple=true` include a blank string.Yves Senn2014-07-171-5/+3
| * | | Merge pull request #16201 from noinkling/masterGodfrey Chan2014-07-161-5/+5
| |\ \ \
| | * | | Fix broken list formatting [ci skip]noinkling2014-07-171-5/+5