aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #5112 from nupurjain/activesupport_cache_refactorSantiago Pastorino2012-02-211-5/+1
|\ \ \ | |/ / |/| | suggested changes.
| * | suggested changes.Nupur Jain2012-02-211-5/+1
| | |
* | | Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactorJon Leighton2012-02-211-3/+3
|\ \ \ | | | | | | | | use Hash#delete on styelsheet_link_tag
| * | | use Hash#delete on styelsheet_link_tagRuben Fonseca2012-02-211-3/+3
|/ / /
* | | Merge pull request #5033 from markmcspadden/inherited_headersJeremy Kemper2012-02-202-0/+41
|\ \ \ | | | | | | | | Allow ActiveResource subclasses to inherit headers from parent
| * | | Remove double test for header inheritance leaksMark McSpadden2012-02-141-11/+0
| | | |
| * | | Allow ActiveResource subclasses to inherit headers from parentMark McSpadden2012-02-132-0/+52
| | | |
* | | | tag bind params with a bind param objectAaron Patterson2012-02-203-3/+3
| | | |
* | | | use Hash#delete with a default blockAaron Patterson2012-02-201-3/+3
| | | |
* | | | Merge pull request #5102 from nashby/form-option-refactorJosé Valim2012-02-202-28/+29
|\ \ \ \ | | | | | | | | | | form option refactor
| * | | | refactor options_for_selectVasiliy Ermolovich2012-02-202-23/+24
| | | | |
| * | | | refactor grouped_options_for_selectVasiliy Ermolovich2012-02-201-5/+5
| | | | |
* | | | | Fix a failing testSantiago Pastorino2012-02-201-0/+2
| | | | |
* | | | | Use the right format when a partial is missing.Santiago Pastorino2012-02-203-0/+9
| | | | | | | | | | | | | | | | | | | | Closes #5025
* | | | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_resetJosé Valim2012-02-202-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered Conflicts: actionpack/lib/action_view/template/handlers.rb
* | | | | search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
|/ / / /
* | | | Merge pull request #5082 from ↵Aaron Patterson2012-02-202-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | willbryant/assigns_should_not_stringify_values_master assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash
| * | | | assigns(:foo) should not convert @foo's keys to strings if it happens to be ↵Will Bryant2012-02-182-1/+7
| | |_|/ | |/| | | | | | | | | | a hash
* | | | Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-202-19/+43
|\ \ \ \ | | | | | | | | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
| * | | | removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 errors, ↵William Lawson2012-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | 31 skips
| * | | | Restored ability to identify ID and Sequence from tables relying on a ↵William Lawson2012-02-202-19/+44
| | | | | | | | | | | | | | | | | | | | nonmatching sequence default value for PK.
* | | | | Merge pull request #5083 from nashby/grouped-select-optionsJosé Valim2012-02-202-1/+24
|\ \ \ \ \ | | | | | | | | | | | | add selected and disabled options to grouped select
| * | | | | add selected and disabled option to grouped selectVasiliy Ermolovich2012-02-182-1/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #5075 from bogdan/json_full_messagesJosé Valim2012-02-203-3/+26
|\ \ \ \ \ | | | | | | | | | | | | AM::Errors: allow :full_messages parameter for #to_json
| * | | | | AM::Errors: allow :full_messages parameter for #as_jsonBogdan Gusiev2012-02-203-3/+26
| | | | | |
* | | | | | Remove fixture files with Windows incompatible filenamesAndrew White2012-02-2013-38/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows.
* | | | | | Integration tests support the OPTIONS http methodJeremy Kemper2012-02-193-2/+26
| |_|/ / / |/| | | |
* | | | | Merge pull request #5085 from simi/patch-1Vijay Dev2012-02-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update activerecord/CHANGELOG.md
| * | | | | Update activerecord/CHANGELOG.mdJosef Šimánek2012-02-181-1/+1
|/ / / / /
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-1812-62/+281
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix some typos [ci skip]Vijay Dev2012-02-181-3/+3
| | | | |
| * | | | Documenting the :inverse_of option for associationsMike Gunderloy2012-02-181-0/+99
| | | | |
| * | | | Fix actionpack readme weblog exampleAlexey Vakhov2012-02-181-1/+1
| | | | |
| * | | | Fix AbstractController::Base#hidden_actions commentAlexey Vakhov2012-02-181-2/+2
| | | | |
| * | | | Do get it right this time. Fixing the documentation around :dependent => ↵Aditya Sanghi2012-02-181-5/+5
| | | | | | | | | | | | | | | | | | | | :restrict option
| * | | | Add note about Rails 4.0 changesAditya Sanghi2012-02-181-0/+4
| | | | |
| * | | | Add a note about :dependent => :restrict on has_one and has_many's optionsAditya Sanghi2012-02-181-0/+2
| | | | |
| * | | | Update Time#change docs to reflect the options it usesEric Oestrich2012-02-171-1/+1
| | | | | | | | | | | | | | | [ci skip]
| * | | | [engines guide] basic revision/review workRyan Bigg2012-02-161-31/+89
| | | | |
| * | | | [engines guide] Clean up explanation for routing methodsRyan Bigg2012-02-161-5/+17
| | | | |
| * | | | [engines guide] Elaborate on isolate_namespace functionalityRyan Bigg2012-02-161-1/+7
| | | | |
| * | | | update engines guide to explicitly reference relative-to-engine-root-path ↵Ryan Bigg2012-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | for db/seeds.rb
| * | | | [engines guide] Revise draft of guide, add testing, assets and dependencies ↵Ryan Bigg2012-02-161-25/+63
| | | | | | | | | | | | | | | | | | | | sections
| * | | | Rails::Engine docs should use helper method, not helpersRyan Bigg2012-02-161-1/+1
| | | | |
| * | | | Fix AM block_format helper method descriptionAlexey Vakhov2012-02-151-2/+1
| | | | |
| * | | | Update f.button docs to reflect real label implementationCarlos Antonio da Silva2012-02-141-5/+5
| | | | |
| * | | | fix spacer template exampleSergey Nartimov2012-02-121-1/+1
| | | | |
| * | | | Cosmetic fix in AM readmeAlexey Vakhov2012-02-121-1/+1
| | | | |
| * | | | Change AR validation guide to remove ordered hash mention related to AMo::ErrorsCarlos Antonio da Silva2012-02-091-1/+1
| | | | |
| * | | | Fixed styles when browser is narrower than 69em.Jeff Dickey2012-02-091-0/+1
| | | | |