aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6373 from bogdan/callbacks_fixJosé Valim2012-05-171-1/+1
|\ | | | | AS::Callbacks: fix run_callbacks for objects with negative id
| * AS::Callbacks: fix run_callbacks for objects with negative idBogdan Gusiev2012-05-181-1/+1
|/
* Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-172-2/+12
|\ | | | | Add some common Array methods to the middleware stack
| * Add the #unshift method to the middleware stackRich Healey2012-05-182-2/+12
| | | | | | | | | | | | The docs suggest that the middleware stack is an Array, so I've added the unshift method to it. Originally I added some more Array methods, but it was agreed that they lacked usecases.
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-172-2/+3
|\ \ | | | | | | Render img tag with empty src if empty string is passed to image_tag.
| * | Render img tag with empty src if empty string is passed to image_tag.Kirill Lashuk2012-05-182-2/+3
| |/
* | Merge pull request #5715 from soulim/add_time_input_controlJeremy Kemper2012-05-178-3/+81
|\ \ | |/ |/| Add HTML5 input[type="time"] helper
| * Add HTML5 input[type="time"] helperAlex Soulim2012-05-188-3/+81
|/
* Merge pull request #6371 from ihid/remove_old_text_helper_apiRafael Mendonça França2012-05-173-69/+27
|\ | | | | Removed old text_helper apis for highlight, excerpt and word_wrap
| * Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-173-69/+27
|/
* Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵Jeremy Kemper2012-05-171-2/+2
| | | | MiniTest deprecation message.
* Revert changes related to `bundle install` fixes in `rails new`Piotr Sarnacki2012-05-172-17/+3
| | | | | | | | | | | Reverted changes: f3482a9 Fix tests in railties 5904295 improve #6318 aed906a prevent using already loaded Gemfile for 'bundle install' In order to fix this, we need a fix in bundler related to GEM_PATH, which will allow to run tests properly. I will get this changes back when it happens.
* Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-172-4/+5
|\ | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-172-4/+5
| |
* | Merge pull request #6238 from pwnall/pgsql_bytea_limitAaron Patterson2012-05-172-8/+20
|\ \ | | | | | | Postgresql doesn't accept limits on binary (bytea) columns.
| * | Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-092-8/+20
| | |
* | | MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
| | |
* | | Merge pull request #6215 from erichmenge/fix_has_secure_passwordAaron Patterson2012-05-175-15/+43
|\ \ \ | | | | | | | | Fix has secure password
| * | | Updated tests for has_secure_password.Erich Menge2012-05-084-10/+33
| | | |
| * | | has_secure_password shouldn't validate password_digest. It should also take ↵Erich Menge2012-05-081-5/+10
| | | | | | | | | | | | | | | | options to turn validations off.
* | | | Update actionpack/CHANGELOG.mdJosé Valim2012-05-171-0/+3
| | | |
* | | | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-179-6/+36
|\ \ \ \ | |_|_|/ |/| | | Created a Raw handler for templates.
| * | | Created a Raw handler for templates.Steve Klabnik2012-05-179-6/+36
| | | | | | | | | | | | | | | | Fixes #2394
* | | | Merge pull request #6250 from iGEL/dont_destroy_readonly_modelsAaron Patterson2012-05-173-0/+7
|\ \ \ \ | | | | | | | | | | Don't allow to destroy readonly models
| * | | | Don't destroy readonly modelsJohannes Barre2012-05-173-0/+7
| | | | |
* | | | | Make MockLogger work with blocks.Rafael Mendonça França2012-05-171-1/+1
| | | | |
* | | | | Merge pull request #6365 from kennyj/fix_warning_20120518Aaron Patterson2012-05-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix warning: ambiguous first argument.
| * | | | Fix warning: ambiguous first argument.kennyj2012-05-181-1/+1
|/ / / /
* | | | Merge pull request #6363 from markmcspadden/fix_duplicable_documentationVijay Dev2012-05-171-1/+1
|\ \ \ \ | | | | | | | | | | Fix documentation around duplicable regarding Class and Module.
| * | | | Fix documentation around duplicable regarding Class and Module.Mark McSpadden2012-05-171-1/+1
|/ / / /
* | | | Merge pull request #6351 from bogdan/callbacksJosé Valim2012-05-171-16/+3
|\ \ \ \ | | | | | | | | | | AS::Callbacks remove useless code, improve performance
| * | | | AS::Callbacks remove useless code, improve performanceBogdan Gusiev2012-05-161-16/+3
| | | | |
* | | | | Merge pull request #6058 from ↵Jon Leighton2012-05-175-7/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects
| * | | | | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-175-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1720-223/+311
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | | | | fix word_wrap eg output [ci skip]Vijay Dev2012-05-171-1/+3
| | | | | | |
| * | | | | | copy edits assets guide [ci skip]Vijay Dev2012-05-171-1/+1
| | | | | | |
| * | | | | | copy edit and remove nodoc on instance_values method [ci skip]Vijay Dev2012-05-171-4/+4
| | | | | | |
| * | | | | | Revert "Update docs in sqlite3 adapter"Vijay Dev2012-05-171-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d7c38b858b0190ac56998f4a4baba250eaf1e4e. Reason: Lot of the additions aren't adding value. [ci skip]
| * | | | | | [getting started] remove two more beginningruby linksRyan Bigg2012-05-171-2/+2
| | | | | | |
| * | | | | | [getting started] add comma in 'First we will make a comment partial'Ryan Bigg2012-05-171-1/+1
| | | | | | |
| * | | | | | [getting started] remove another beginning ruby linkRyan Bigg2012-05-171-1/+1
| | | | | | |
| * | | | | | [getting started] briefly explain form_for with array parametersRyan Bigg2012-05-171-1/+4
| | | | | | |
| * | | | | | [getting started] Remove beginning ruby link in posts/showRyan Bigg2012-05-171-1/+1
| | | | | | |
| * | | | | | [getting started] generating routes manually was done as a learningRyan Bigg2012-05-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | exercise, fix typos
| * | | | | | [getting started] split up section about rake routes after 'resources' callRyan Bigg2012-05-171-1/+4
| | | | | | |
| * | | | | | [getting started] dialog box is not automatic, is provided through ↵Ryan Bigg2012-05-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | jquery_ujs, which is necessary to have in application layout
| * | | | | | [getting started] Fix index template after destroy action additionRyan Bigg2012-05-171-1/+3
| | | | | | |
| * | | | | | [getting started] dabase -> databaseRyan Bigg2012-05-171-1/+1
| | | | | | |
| * | | | | | [getting started guide] more explanation around the delete routing method:Ryan Bigg2012-05-171-7/+15
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 10:43:40 +0000