aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9046 from exviva/actionmailer_subject_interpolationsCarlos Antonio da Silva2013-01-254-3/+31
|\ | | | | Allow passing interpolations to #default_i18n_subject in mailers
| * Allow passing interpolations to `#default_i18n_subject`, e.g.:Olek Janiszewski2013-01-244-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # config/locales/en.yml en: user_mailer: welcome: subject: 'Hello, %{username}' # app/mailers/user_mailer.rb class UserMailer < ActionMailer::Base def welcome(user) mail(subject: default_i18n_subject(username: user.name)) end end
* | Merge pull request #8303 from jeremywrowe/masterRafael Mendonça França2013-01-253-1/+11
|\ \ | | | | | | | | | | | | | | | | | | Fixes improper database name when creating a new rails app with a '.' Conflicts: railties/CHANGELOG.md
| * | Fixes improper database name when a '.' is included while creating a new railsJeremy W. Rowe2013-01-163-1/+11
| | | | | | | | | | | | | | | | | | application. EG: `rails new something.awesome.com` Conflicts: railties/CHANGELOG.md
* | | Remove obsolete test fileJon Leighton2013-01-251-35/+0
| | | | | | | | | | | | https://github.com/rails/rails/commit/4beb4dececcf10c642c74fbcb8548c833e921a86#commitcomment-2482869
* | | Deprecate the `eager_load_paths` configurationAndrew White2013-01-247-66/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the default in Rails 4.0 is to run in 'threadsafe' mode we need to eager load all of the paths in `autoload_paths` so we alias `eager_load_paths` to it. This may have unintended consequences if you have added 'lib' to `autoload_paths` such as loading unneeded code or code intended only for development and/or test environments. If this applies to your application you should thoroughly check what is being eager loaded.
* | | use the helpers list rather than getting the methods from the moduleAaron Patterson2013-01-241-1/+1
| | |
* | | module_eval is not necessary hereAaron Patterson2013-01-241-3/+1
| | |
* | | don't need to eval everythingAaron Patterson2013-01-241-1/+1
| | |
* | | reduce the number of queries on IN clauses, fix relation queries in `where`Aaron Patterson2013-01-243-2/+20
| | |
* | | stop converting strings to symbolsAaron Patterson2013-01-241-1/+1
| | |
* | | Default dead_connection_timeout to 5Akira Matsuda2013-01-241-1/+1
| | | | | | | | | | | | or the ConnectionPool silently fails to close connections inside the Thread
* | | Describing the reason for defining BlankTopic#blank? which will never be calledAkira Matsuda2013-01-241-0/+1
| | |
* | | Revert "Unused methods, module, etc."Akira Matsuda2013-01-244-0/+28
| | | | | | | | | | | | | | | | | | This reverts commit 4e05bfb8e254c3360a3ca4a6cb332995314338fe. Reason: BlankTopic#blank? should not be removed to check that dynamic finder with a bang can find a model that responds to `blank?`
* | | Unused methods, module, etc.Akira Matsuda2013-01-244-28/+0
| | |
* | | Set Thread.abort_on_exception for the whole AS, AP, and AR testsAkira Matsuda + Koichi Sasada2013-01-243-0/+6
| | | | | | | | | | | | this would give us some more clues in case a test silently dies inside Thread
* | | Unused test modelAkira Matsuda2013-01-241-5/+0
| | |
* | | Goodbye there, very special rubbish!Akira Matsuda2013-01-244-19/+1
| | |
* | | proxy_{owner,reflection,target} are no more availableAkira Matsuda2013-01-241-11/+1
| | |
* | | Unused model DeprecatedPostWithCommentAkira Matsuda2013-01-241-7/+0
| | |
* | | Depend on thor >= 0.17.0Carlos Antonio da Silva2013-01-232-4/+1
| | |
* | | Fix PostgreSQL tests on TravisAndrew White2013-01-243-11/+37
| | | | | | | | | | | | Travis only has PostgreSQL 9.1.x but 9.2 is required for range datatypes.
* | | ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]Xavier Noria2013-01-232-3/+7
| | |
* | | Merge pull request #7345 from slbug/masterRafael Mendonça França2013-01-2311-189/+431
|\ \ \ | |_|/ |/| | Postgresql range support
| * | Add postgresql range types supportbUg2013-01-2311-189/+431
| | |
* | | Remove warning by using a custom coderAndrew White2013-01-231-2/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | The native JSON library bypasses the `to_json` overrides in active_support/core_ext/object/to_json.rb by calling its native implementation directly. However `ActiveRecord::Store` uses a HWIA so `JSON.dump` will call our `to_json` instead with a `State` object for options rather than a `Hash`. This generates a warning when the `:encoding`, `:only` & `:except` keys are accessed in `Hash#as_json` because the `State` object delegates unknown keys to `instance_variable_get` in its `:[]` method. Workaround this warning in the test by using a custom coder that calls `ActiveSupport::JSON.encode` directly.
* | Merge pull request #9035 from adomokos/aligning_testsCarlos Antonio da Silva2013-01-231-0/+8
|\ \ | | | | | | Adding the route_key and param_key tests
| * | Adding the route_key and param_key testsAttila Domokos2013-01-221-0/+8
| | | | | | | | | This way all the tests are testing the same fields
* | | A test case name needs to start with "test_"Akira Matsuda2013-01-231-1/+1
| | |
* | | Fix some wrong String extensions testsAkira Matsuda2013-01-231-7/+9
| | | | | | | | | | | | | | | | | | * ASCII_STRING was not an ASCII String * BYTE_STRING was not an in valid UTF-8 String * added an assertion for non-UTF-8 String
* | | Test String#dasherizeAkira Matsuda2013-01-231-0/+6
| | |
* | | Test that rescue_from accepts a class name in StringAkira Matsuda2013-01-231-2/+1
| | |
* | | Test Kernel#quietlyAkira Matsuda2013-01-231-0/+12
| | |
* | | Test try! with a blockAkira Matsuda2013-01-231-0/+4
| | |
* | | Test that DeprecatedConstantProxy does not warn when accessing its classAkira Matsuda2013-01-231-0/+1
| | |
* | | Missing AS::Deprecation::DeprecatedObjectProxy testAkira Matsuda2013-01-231-0/+5
| | |
* | | Test that a DateTime acts_like_dateAkira Matsuda2013-01-231-0/+4
|/ /
* | Merge pull request #9031 from virusman/doc-no-asset-concatGuillermo Iguaran2013-01-222-125/+0
|\ \ | | | | | | Remove old asset tags API from docs
| * | Remove old asset tags API from docs, reflecting changes from #7900virusman2013-01-232-125/+0
| | |
* | | Less strict activerecord-deprecated_finders versionRafael Mendonça França2013-01-221-1/+1
| | |
* | | Revert "Round usec when writing timestamp attribute."Andrew White2013-01-222-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e9d2ad395ec2ef929d74752f3d71c80674044fbe. Closes #8460 Conflicts: activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb activerecord/test/cases/dirty_test.rb
* | | Add failing test case for #8460Andrew White2013-01-221-0/+14
| | | | | | | | | | | | Add a test case to ensure that fractional second updates are detected.
* | | Merge pull request #9027 from carlosantoniodasilva/revert-localeSteve Klabnik2013-01-225-37/+24
|\ \ \ | | | | | | | | Revert locale
| * | | Revert "Merge pull request #7873 from steveklabnik/update_initializer"Carlos Antonio da Silva2013-01-222-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 43e14f8ff203c21646f733d35bdde4e68da70a3b, reversing changes made to bb17a0f085aba40a1952612f6c98b2a5804a1152. Conflicts: railties/lib/rails/generators/rails/app/templates/config/application.rb railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb Reason: setting the Time.zone in an after_initialize block can become a problem for people upgrading, since it's not going to be available when config/initializers run, and people might be relying on it. An example that I noticed was with the Chronic gem, for date/time parsing. It requires us to configure the time class to be Time.zone, and doing that in an initializer no longer worked with these changes, so reverting is the safer path for now.
| * | | Revert "Set the default timezone after the initialization since the ↵Carlos Antonio da Silva2013-01-222-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | configuration" This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b.
| * | | Revert "updating i18n guide with locale config location."Carlos Antonio da Silva2013-01-221-1/+1
| |/ / | | | | | | | | | This reverts commit 46902908910c041e268429d674bbe084399cc664.
* | | Lets kepp using Ruby 1.9 syntaxRafael Mendonça França2013-01-222-37/+37
| | |
* | | Only check for unpermmited parameters ifRafael Mendonça França2013-01-221-1/+1
|/ / | | | | | | action_on_unpermitted_parameters is present
* | avoid creating an object in every callXavier Noria2013-01-221-1/+2
| | | | | | | | This was a suggestion of @carlosantoniodasilva, thanks!
* | Merge pull request #9026 from tricknotes/remove-unnecessary-requireXavier Noria2013-01-221-1/+0
|\ \ | | | | | | Remove unnecessary require