aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge pull request #5125 from winston/log_exception_when_cache_read_failsMichael Koziarski2012-05-212-1/+11
|\ \ \ \ | | | | | | | | | | #read_entry in ActiveSupport::Cache::FileStore should log details of the exception when an exception is thrown
| * | | | #read_entry in ActiveSupport::Cache::FileStore should log details of the ↵Winston2012-02-222-1/+11
| | | | | | | | | | | | | | | | | | | | exception when an exception is thrown.
* | | | | using __method__ for the command method callsAaron Patterson2012-05-212-5/+64
| | | | |
* | | | | Merge pull request #6429 from marcandre/fix_test_requestCarlos Antonio da Silva2012-05-212-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | | Fix bug when Rails.application is defined but is nil. See #881
| * | | | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-212-1/+8
| | | | |
* | | | | Remove not used variables from connection poll testCarlos Antonio da Silva2012-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | These variables were issuing some "not used" warnings.
* | | | | Refactor aggregation writer methodCarlos Antonio da Silva2012-05-212-5/+3
| | | | | | | | | | | | | | | | | | | | Only constantize class_name once.
* | | | | Merge pull request #5156 from avakhov/class-attribute-instance-accessorCarlos Antonio da Silva2012-05-214-4/+14
|\ \ \ \ \ | |/ / / / |/| | | | Add instance_accessor option to class_attribute
| * | | | Add instance_accessor option to class_attributeAlexey Vakhov2012-05-224-4/+14
|/ / / /
* | | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-212-72/+23
| | | | | | | | | | | | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
* | | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-212-23/+72
|\ \ \ \ | |_|_|/ |/| | | Resolver concurrency fix
| * | | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure.
| * | | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access.
* | | | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-212-3/+17
|\ \ \ \ | | | | | | | | | | When a route references a missing controller, raise ActionController::RoutingError with clearer message
| * | | | When a route references a missing controller, raise ↵Trek Glowacki2011-08-162-3/+17
| | | | | | | | | | | | | | | | | | | | ActionController::RoutingError with a clearer message
* | | | | Merge pull request #6416 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-213-35/+202
|\ \ \ \ \ | | | | | | | | | | | | Make connection pool fair with respect to waiting threads.
| * | | | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-203-35/+202
| | | | | |
* | | | | | Merge pull request #6143 from senny/composed_of_converter_returns_nilAaron Patterson2012-05-213-7/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow the :converter Proc form composed_of to return nil
| * | | | | | allow the :converter Proc form composed_of to return nilYves Senn2012-05-033-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to filter invalid input values before they are passed into the value-object (like empty strings). This behaviour is only relevant if the :allow_nil options is set to true. Otherwise you will get the resulting NoMethodError.
* | | | | | | Merge pull request #6424 from avakarev/refactoring_unless-elseJeremy Kemper2012-05-211-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactoring: just turn unless/else into if/else
| * | | | | | | Refactoring: turn unless/else into if/elseAndrey Vakarev2012-05-211-9/+9
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 21:29:36 +0000