aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | eliminating a branch we do not need. thanks @jeremyAaron Patterson2012-03-261-30/+3
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | stop using *args in order to simplify our constructorAaron Patterson2012-03-261-5/+4
* | | | | | | | | Merge pull request #5592 from nashby/fix-issue-5584Piotr Sarnacki2012-03-262-3/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | String#titleize works properly with smart quotes, closes #5584Vasiliy Ermolovich2012-03-262-3/+7
* | | | | | | | | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-argAaron Patterson2012-03-262-3/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-232-3/+21
* | | | | | | | | | | Don't depend on ivars. Thanks @fesplugasAaron Patterson2012-03-261-1/+1
* | | | | | | | | | | Merge pull request #5594 from lest/patch-1Piotr Sarnacki2012-03-262-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
* | | | | | | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an errorGuten2012-03-262-1/+14
* | | | | | | | | | | | Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0Aaron Patterson2012-03-261-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | sprockets-rails 1.0.0 was released, remove git dependency from GemfileGuillermo Iguaran2012-03-261-2/+0
* | | | | | | | | | | | no need to freeze things all the timeAaron Patterson2012-03-261-8/+7
* | | | | | | | | | | | test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-03-261-1/+9
* | | | | | | | | | | | Merge pull request #5593 from lukesarnacki/activemodel_name_composition_over_...Aaron Patterson2012-03-262-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ActiveModel::Name does not inherit from stringLukasz Sarnacki2012-03-262-12/+17
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5183 from lest/patch-1José Valim2012-03-261-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use content_tag in button_to helperSergey Nartimov2012-03-141-2/+3
* | | | | | | | | | | | Merge pull request #5581 from jamie/custom_param_fieldJosé Valim2012-03-262-4/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Allow a defining custom member field on resourcesJamie Macey2012-03-252-4/+23
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5575 from phiggins/remove_conditional_from_statistics_taskXavier Noria2012-03-251-7/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove useless conditional.Pete Higgins2012-03-251-7/+1
|/ / / / / / / / / / /
* | | | | | | | | | | restores example depicting the use of true or false in regular fontXavier Noria2012-03-251-0/+14
* | | | | | | | | | | Merge pull request #5566 from lest/patch-3Piotr Sarnacki2012-03-252-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix HashWithIndifferentAccess.[] methodSergey Nartimov2012-03-232-0/+13
* | | | | | | | | | | | Merge pull request #5570 from avakhov/ac-caching-splitJeremy Kemper2012-03-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ActionController caching small String#split optimizationAlexey Vakhov2012-03-241-2/+2
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* / | | | | | | | | | | Revert "Return an actual boolean from xml_http_request?"Xavier Noria2012-03-251-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-2413-99/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | spacing fix in guide [ci skip]Vijay Dev2012-03-241-1/+1
| * | | | | | | | | | | [getting started][ci skip] fix link to the codeFabián Rodríguez2012-03-231-1/+1
| * | | | | | | | | | | :foreign_key option should be on has_many side of associationMikhail Dieterle2012-03-231-2/+2
| * | | | | | | | | | | Adding documentation for ActiveRecord::Base.abstract_class to clarify a parti...Joe Goggins2012-03-221-0/+14
| * | | | | | | | | | | Update config.assets.initialize_on_precompile warning to include engine side ...adman652012-03-221-1/+3
| * | | | | | | | | | | [engines] [ci-skip] Add example of precompiling engine assetsadman652012-03-221-0/+15
| * | | | | | | | | | | improvements in "caching_with_rails" guidekucaahbe2012-03-221-8/+10
| * | | | | | | | | | | Fixed-width font fix for instance variableJuanjo Bazán2012-03-201-1/+1
| * | | | | | | | | | | [ci skip] Make guides more readable & consistentMark D. Blackwell2012-03-203-82/+83
| * | | | | | | | | | | Correct description of ['migrated_at > ?', 1.week.ago] from "more than a week...Dave Burt2012-03-201-1/+1
| * | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsCharles Brian Quinn2012-03-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Adding comma to correct syntax in comment.Jesse Brown2012-03-191-1/+1
| * | | | | | | | | | | | Updates ActionMailer Base summary and fixes space in code example.Charles Brian Quinn2012-03-191-4/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5569 from arunagw/warning_remove_masterVijay Dev2012-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | removed warning: shadowing outer local variable - exceptionArun Agrawal2012-03-241-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5567 from tpope/xhr-booleanAaron Patterson2012-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Return an actual boolean from xml_http_request?Tim Pope2012-03-231-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | oops, forgot to commit the tests! :bomb:Aaron Patterson2012-03-231-0/+67
* | | | | | | | | | | chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
* | | | | | | | | | | Merge pull request #5550 from schneems/schneems/server_envAaron Patterson2012-03-234-0/+63
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | match rails console environment support, to serverschneems2012-03-222-0/+32