aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6383 from oscardelben/add_oscardelben_to_authorsVijay Dev2012-05-232-0/+4
|\ | | | | Add oscardelben to authors
| * Add oscardelben to authorsOscar Del Ben2012-05-182-0/+4
| |
* | Merge pull request #6194 from ayrton/optimized_imagesVijay Dev2012-05-2372-0/+0
|\ \ | | | | | | Optimizing all images used in the guides
| * | Compressed all images from the guide through ImageOptim which saves ↵Ayrton De Craene2012-05-0772-0/+0
| | | | | | | | | | | | sometimes up to 74.6% in size [ci skip]
* | | Merge pull request #6462 from grosser/feature/licensesJosé Valim2012-05-237-0/+7
|\ \ \ | | | | | | | | Add license field to gemspecs, by Matt Griffin
| * | | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-237-0/+7
| | | |
* | | | Merge pull request #6463 from jrochkind/connection_pool_timeout_keysAaron Patterson2012-05-234-12/+21
|\ \ \ \ | | | | | | | | | | ConnectionPool wait_timeout no longer used for different types of timeouts. #6441
| * | | | ConnectionPool wait_timeout no longer used for different types of timeouts. ↵Jonathan Rochkind2012-05-234-12/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6441 An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same.
* | | | Merge pull request #6060 from lucashungaro/masterCarlos Antonio da Silva2012-05-235-1/+159
|\ \ \ \ | |/ / / |/| | | Adding deep versions of stringify_keys and symbolize_keys (plain and bang) for nested hashes
| * | | Adding deep versions of stringify_keys and symbolize_keys (plain and bang) ↵Lucas Húngaro2012-05-235-1/+159
|/ / / | | | | | | | | | for nested hashes
* | | Merge pull request #6259 from markmcspadden/hash_transform_keysRafael Mendonça França2012-05-234-18/+74
|\ \ \ | | | | | | | | Add Hash#transform_keys and Hash#transform_keys!
| * | | Add Hash#transform_keys and Hash#transform_keys! and refactor *_keys methods ↵Mark McSpadden2012-05-234-18/+74
|/ / / | | | | | | | | | to use them.
* | | Merge pull request #6446 from acapilleri/mini_xml_4Carlos Antonio da Silva2012-05-238-19/+22
|\ \ \ | | | | | | | | Change xml type datetime to dateTime
| * | | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-238-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog
* | | | Merge pull request #6455 from ugisozols/masterCarlos Antonio da Silva2012-05-231-1/+0
|\ \ \ \ | |/ / / |/| | | Remove unnecessary comment.
| * | | Remove unnecessary comment.Uģis Ozols2012-05-231-1/+0
|/ / /
* | | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-222-0/+24
|\ \ \ | | | | | | | | Added session.keys and session.values back to ActionDispatch::Request::Session
| * | | Added ActionDispatch::Request::Session#keys and ↵Philip Arndt2012-05-232-0/+24
| | | | | | | | | | | | | | | | ActionDispatch::Request::Session#values
* | | | Merge pull request #6452 from carlosgaldino/refactor-date-helpersRafael Mendonça França2012-05-227-50/+44
|\ \ \ \ | |/ / / |/| | | Refactor date related input helpers
| * | | Add tests for time_field and date_field helpersCarlos Galdino2012-05-221-0/+18
| | | | | | | | | | | | | | | | These tests check the values of 'min' and 'max' input attrs
| * | | Refactor date related helpersCarlos Galdino2012-05-226-50/+26
|/ / /
* | | I guess we have to return a pathname object. o_OAaron Patterson2012-05-221-1/+1
| | |
* | | use File.realpath and avoid making Pathname objectsAaron Patterson2012-05-221-2/+1
| | |
* | | use RUBY_PLATFORM in case of cross compiled rubyAaron Patterson2012-05-221-1/+1
| | |
* | | initialize instance variablesAaron Patterson2012-05-221-2/+6
| | |
* | | initialize our instance variablesAaron Patterson2012-05-221-2/+14
| | |
* | | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-2213-2/+446
|\ \ \ | | | | | | | | Add HTML5 color and date/time inputs
| * | | Add several HTML5 input helpersCarlos Galdino2012-05-2111-2/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"]
| * | | Add HTML5 input[type="color"] helperCarlos Galdino2012-05-219-2/+70
| | | |
* | | | Merge pull request #6433 from parndt/fix_typoRafael Mendonça França2012-05-222-5/+15
|\ \ \ \ | | | | | | | | | | Fixed typo new_defautls -> new_defaults.
| * | | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-232-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
* | | | | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"Rafael Mendonça França2012-05-223-202/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request.
* | | | | Fix the buildSantiago Pastorino2012-05-224-3/+1
| | | | |
* | | | | Merge pull request #6440 from gaurish/route_move_topJeremy Kemper2012-05-221-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Move root method at TOP of routes file
| * | | | | Move root method at TOP of routes fileGaurish Sharma2012-05-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the change as per the following text in routing guide:- "You should put the root route at the top of the file, because it is the most popular route and should be matched first." However, if root is best left at bottom. We will change to fix that text
* | | | | | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-225-1/+4
| | | | | |
* | | | | | Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-222-10/+61
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Support migrating from Hash to HashWithIndifferentAccess for accessing attributes.
| * | | | | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-222-10/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make migration from 3.x apps easier, we should try to convert Hash instances to HashWithIndifferentAccess, to allow accessing values with both symbol and a string. This is follow up to changes in 3c0bf043.
* | | | | | Merge pull request #6439 from janx/remove_useless_requireJosé Valim2012-05-222-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | refactor lazy_load_hooks load position, fix #6435
| * | | | | | refactor lazy_load_hooks load positionJan Xie2012-05-222-1/+1
| | | | | | |
* | | | | | | Merge pull request #6437 from avakhov/gen-gem-methodJosé Valim2012-05-224-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use new hash syntax for generators gem method
| * | | | | | | Use new hash syntax for generators gem methodAlexey Vakhov2012-05-224-4/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gemfile of new application uses ruby 1.9 hashes. Gem method of generators should use them too. It prevents from mixing two kinds of syntax in one file.
* | | | | | | Merge pull request #6435 from janx/remove_useless_requirePiotr Sarnacki2012-05-221-1/+0
|\| | | | | | | | | | | | | | | | | | | | remove useless require
| * | | | | | remove useless requireJan Xie2012-05-221-1/+0
| | |/ / / / | |/| | | |
* / | | | | Use require_dependency in generated controllersPiotr Sarnacki2012-05-223-4/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require.
* | | | | Merge pull request #6150 from avakhov/dbconsole-fixesPiotr Sarnacki2012-05-214-10/+38
|\ \ \ \ \ | | | | | | | | | | | | Rails db console improvements
| * | | | | Fix `rails db -h` and cosmetic fixes in usage bannersAlexey Vakhov2012-05-224-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby tries to use '-h' as short version of '--header' by default https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L1372-1381. To force `rails db -h` prints an usage message we should add the `-h` options explicitly.
| * | | | | Use relative path to sqlite3 db in `rails db` commandAlexey Vakhov2012-05-222-7/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails uses sqlit3 db file with a path relative to the rails root. It allows to execute server not from rails root only. For example you can fire `./spec/dummy/script/rails s` to start dummy application server if you develop some engine gem. Now the `rails db` command uses relative paths also and you can explore your dummy db via `./spec/dummy/script/rails db` command.
* | | | | Merge pull request #6420 from ↵Piotr Sarnacki2012-05-212-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | chancancode/master_restore_frozen_state_on_rollback Restore frozen state on rollback, fixes #6417
| * | | | | Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-212-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when saving a frozen record, an exception would be thrown which causes a rollback. However, there is a bug in active record that "defrost" the record as a side effect: >> t = Topic.new => #<Topic id: nil, ...> >> t.freeze => #<Topic id: nil, ...> >> t.save RuntimeError: can't modify a frozen Hash >> t.frozen? => false >> t.save => true This patch fixes the bug by explictly restoring the frozen state on the attributes Hash after every rollback.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:49:33 +0000