aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-202-35/+22
|\ \ \ | | | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * | | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-40/+18
| | | |
| * | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
| | | |
* | | | Freeze the middleware stack after it's builtJeremy Kemper2012-04-203-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole. Closes #5911
* | | | Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_optionJeremy Kemper2012-04-192-1/+31
|\ \ \ \ | | | | | | | | | | current MySQL driver fails to fetch PK name when the PK has USING option
| * | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-192-1/+31
|/ / / / | | | | | | | | | | | | option
* | | | Remove unused generator options. This was added for the removed rails new --httpSantiago Pastorino2012-04-183-9/+0
| | | |
* | | | Add hook for add_resource_routeSantiago Pastorino2012-04-183-7/+16
| | | |
* | | | Merge pull request #5891 from kennyj/remove_time_directoryJeremy Kemper2012-04-181-5/+0
|\ \ \ \ | | | | | | | | | | Remove dead code: active_support/time/autoload.rb was moved to active_support/time.rb
| * | | | Remove unused code. We should use 'active_support/time'.kennyj2012-04-191-5/+0
|/ / / /
* | | | Merge pull request #5889 from juanazam/juan-masterSantiago Pastorino2012-04-181-0/+2
|\ \ \ \ | |_|_|/ |/| | | Add missing dependency for active_record_deprecated_finders
| * | | Add missing dependency for active_record_deprecated_findersJuan Manuel Azambuja2012-04-181-0/+2
|/ / /
* | | Merge pull request #5869 from LachyGroom/patch-1Piotr Sarnacki2012-04-171-1/+1
|\ \ \ | | | | | | | | Changes b tag to strong
| * | | Changes b tag to strong CollectiveJam2012-04-161-1/+1
| | | | | | | | | | | | | | | | The change is made due to importance of the attribute name (e.g. Name:) on the page (versus just stylistic / appearance sake tag).
* | | | Merge pull request #5882 from vijaydev/fix_generated_attribute_buildSantiago Pastorino2012-04-171-2/+4
|\ \ \ \ | | | | | | | | | | Fixing the build
| * | | | the index option is always created if the type is one of references or ↵Vijay Dev2012-04-181-2/+4
|/ / / / | | | | | | | | | | | | belongs_to. Refactoring it to a simpler form and fixing the build
* | | / let's not use `and` in place of `&&`Vijay Dev2012-04-181-1/+1
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-1811-27/+63
|\ \ \
| * | | let's keep the slash in the return value instead of the path variable [ci skip]Vijay Dev2012-04-181-2/+2
| | | |
| * | | Fix confusing example in ActiveModel::ErrorsThibaut Courouble2012-04-171-2/+2
| | | |
| * | | Warn about do end syntax in redirect optionOscar Del Ben2012-04-171-0/+3
| | | |
| * | | Fix redirect with block exampleAlexey Vakhov2012-04-171-3/+3
| | | |
| * | | Fix example in flash middlewareAlexey Vakhov2012-04-171-1/+1
| | | |
| * | | Fix typo where a table name in a join was singular.Don Petersen2012-04-161-1/+1
| | | |
| * | | Fixed a typo in migrationsluke2012-04-151-1/+1
| | | |
| * | | fix ActiveModel::Validations::Callbacks docJan Xie2012-04-151-1/+2
| | | |
| * | | fix bad format [ci skip]Michael de Silva2012-04-141-7/+7
| | | |
| * | | Improve example in initializerOscar Del Ben2012-04-141-1/+1
| | | |
| * | | SQL query formattingBertrand Chardon2012-04-131-2/+7
| | | | | | | | | | | | | | | | | | | | Reformatted two SQL queries in Section 6) and 7) to avoid horizontal scrolling where possible.
| * | | Fix comment in AD http responseAlexey Vakhov2012-04-131-1/+1
| | | | | | | | | | | | | | | | response in integration test accessible without @ via attr_reader
| * | | Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
| | | |
| * | | Revert "Added documentation to explain what happens if you don't set any ↵Rodrigo Flores2012-04-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | values for the dependent option on has_many" This reverts commit 820a677d8622a540188704941a31871ed4d61461.
| * | | Added documentation to explain what happens if you don't set any values for ↵Rodrigo Flores2012-04-121-2/+5
| | | | | | | | | | | | | | | | the dependent option on has_many
| * | | Add documentation to detail passing of an object as the secondMichael de Silva2012-04-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter passed to the ActiveSupport::Notifications.subscribe method instead of a block Example code sample and output is provided as well.
| * | | Fix further typos in ActiveSupport::NotificationsMichael de Silva2012-04-131-4/+4
| | | |
| * | | Fix rdoc typo in ActiveSupport::NotificationsMichael de Silva2012-04-131-1/+1
| | | |
| * | | Fix typo on the add_index.kennyj2012-04-131-1/+1
| | | |
* | | | Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload"Aaron Patterson2012-04-171-0/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 86c640a1625aa3a8ec8728c2f1c640c9718fcb0b, reversing changes made to a0c2cfdc51e16fc39c1d3b1e78bdd257188fa04e.
* | | | Merge pull request #5871 from rafaelfranca/patch-1José Valim2012-04-171-5/+0
|\ \ \ \ | | | | | | | | | | Remove unused test code.
| * | | | Remove unused test code.Rafael Mendonça França2012-04-161-5/+0
| | |/ / | |/| | | | | | | | | | | | | | ActionController::RoutingError are raised in router execution time and can not be rescued in a controller.
* / | | Fix testSantiago Pastorino2012-04-161-2/+2
|/ / /
* | | Merge pull request #5864 from vatrai/remove_ordered_hash_autoloadAaron Patterson2012-04-161-1/+0
|\ \ \ | |_|/ |/| | remove autoload for OrderedHash, usages removed already
| * | remove autoload for OrderedHash, usages removed alreadyVishnu Atrai2012-04-161-1/+0
|/ /
* | Merge pull request #5835 from asanghi/masterJeremy Kemper2012-04-161-1/+1
|\ \ | | | | | | Update Gemfile to use 'debugger' instead of unmaintained 'ruby-debug19'
| * | Hey, let's just make it easier for everyone and dump the unmaintained ↵Aditya Sanghi2012-04-141-1/+1
| | | | | | | | | | | | ruby-debug19 and move to debugger. Whats the consensus here? If we want better adoption on ruby1.9, please lets just use this fork.
* | | Relax multi_json dependency to allow any 1.3 -> 1.x instead of just 1.3.xJeremy Kemper2012-04-161-1/+1
| | |
* | | Merge pull request #5863 from rosenfeld/explicit-log-levelJeremy Kemper2012-04-161-2/+2
|\ \ \ | | | | | | | | Make log_level explicit in production.rb template
| * | | Make log_level explicit in production.rb templateRodrigo Rosenfeld Rosas2012-04-161-2/+2
|/ / / | | | | | | | | | | | | | | | The 'production' environment name is currently checked for setting up the default log_level to 'info' but that won't work if the environment is copied to staging.rb, for instance. Better to have it explicitly set.
* | | Merge pull request #5860 from arunagw/multi_json_upgrade_fixPiotr Sarnacki2012-04-162-4/+4
|\ \ \ | | | | | | | | fixed broken build after multi_json upgrade
| * | | fixed broken build after multi_json upgradeArun Agrawal2012-04-162-4/+4
|/ / / | | | | | | Multi_json also upgraded.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 20:19:26 +0000