aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused variableRafael Mendonça França2014-04-041-1/+1
|
* Merge pull request #14598 from rajcybage/assert_dprecated_for_as_test_caseRafael Mendonça França2014-04-041-4/+4
|\ | | | | Active support instead of ActiveSupport::Deprecation.silence we can use assert_deprecated
| * Active support instead of ActiveSupport::Deprecation.silence we can use ↵Rajarshi Das2014-04-041-4/+4
| | | | | | | | assert_deprecated
* | Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1Rafael Mendonça França2014-04-043-10/+29
|\ \ | | | | | | Ensure we supply Kernel#y for 1.9 too
| * | Ensure we supply Kernel#y for 1.9 tooMatthew Draper2014-04-043-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | In 1.9, it doesn't live in its own file, so we'll have to define it ourselves. Check RUBY_VERSION, instead of rescuing the require, because we want this to break if `psych/y` moves in a future Ruby release.
* | | Merge pull request #14593 from tgxworld/fix_postgresql_schema_test_random_orderYves Senn2014-04-041-17/+16
|\ \ \ | |/ / |/| | Prevent state leak in test.
| * | Prevent state leak in test.Guo Xiang Tan2014-04-031-17/+16
|/ / | | | | | | This will allow us to run the tests in random order.
* | Merge pull request #14582 from arthurnn/blacklist_ruby_methodsRafael Mendonça França2014-04-034-1/+15
|\ \ | | | | | | Blacklist ruby keywords for scopes
| * | Block a few default Class methods as scope name.Arthur Neves2014-04-034-1/+15
|/ / | | | | | | | | | | Add tests to make sure scopes cannot be create with names such as: private, protected, public. Make sure enum values don't collide with those methods too.
* | Merge pull request #14572 from laurocaetano/with_options_and_scopeRafael Mendonça França2014-04-036-1/+24
|\ \ | | | | | | | | | | | | | | | | | | Fix error when using `with_options` with lambda. Conflicts: activerecord/CHANGELOG.md
| * | Fix error when using `with_options` with lambda.Lauro Caetano2014-04-036-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was causing error when using `with_options` passing a lambda as its last argument. class User < ActiveRecord::Base with_options dependent: :destroy do |assoc| assoc.has_many :profiles, -> { where(active: true) } end end It was happening because the `option_merger` was taking the last argument and checking if it was a Hash. This breaks the HasMany usage, because its last argument can be a Hash or a Proc. As the behavior described in this test: https://github.com/rails/rails/blob/master/activesupport/test/option_merger_test.rb#L69 the method will only accept the lambda, this way it will keep the expected behavior. See 9eaa0a34
* | | Merge pull request #14590 from czak/improved_kindlerb_error_messageArthur Nogueira Neves2014-04-031-2/+2
|\ \ \ | | | | | | | | Improve error message for guides:generate:kindle
| * | | Improve error message for guides:generate:kindleŁukasz Adamczak2014-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With `kindlegen` missing from the PATH, the task keeps suggesting to `gem install kindlerb`. This change provides a more meaningful error message for guides:generate:kindle.
* | | | Merge pull request #14588 from matthewd/kernel_y_with_springRafael Mendonça França2014-04-031-0/+1
|\ \ \ \ | |/ / / |/| | | Explicitly load Kernel#y when starting a console
| * | | Explicitly load Kernel#y when starting a consoleMatthew Draper2014-04-041-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Previously, we relied on the IRB-detection in Psych itself. But that doesn't work when we're running under spring: the application boots (and thus psych is required) before we switch to console mode and load IRB. Fixes #14587.
* | | Merge pull request #14569 from matthewd/sqlite_relative_deprecatedRafael Mendonça França2014-04-039-32/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revise 'sqlite3:' URL handling for smoother upgrades Conflicts: activerecord/CHANGELOG.md
| * | | Complete change of `sqlite3:///` path handlingMatthew Draper2014-04-033-17/+11
| | | | | | | | | | | | | | | | That which was now relative is now absolute.
| * | | Revise 'sqlite3:' URL handling for smoother upgradesMatthew Draper2014-04-039-33/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue.
* | | | Merge pull request #14570 from matthewd/uri_deprecation_warningRafael Mendonça França2014-04-032-24/+76
|\ \ \ \ | |_|/ / |/| | | Avoid a spurious deprecation warning for database URLs
| * | | Avoid including DB details in exception messagesMatthew Draper2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | The keys are quite sufficient; we shouldn't be throwing passwords around.
| * | | Avoid a spurious deprecation warning for database URLsMatthew Draper2014-04-032-23/+75
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is all about the case where we have a `DATABASE_URL`, and we have a `database.yml` present, but the latter doesn't contain the key we're looking for. If the key is a symbol, we'll always connect to `DATABASE_URL`, per the new behaviour in 283a2edec2f8ccdf90fb58025608f02a63948fa0. If the key is a string, on the other hand, it should always be a URL: the ability to specify a name not present in `database.yml` is new in this version of Rails, and that ability does not stretch to the deprecated use of a string in place of a symbol. Uncovered by @guilleiguaran while investigating #14495 -- this actually may be related to the original report, but we don't have enough info to confirm.
* | | Merge pull request #14561 from tgxworld/refactor_run_without_connectionYves Senn2014-04-0310-64/+44
|\ \ \ | | | | | | | | Add ConnectionHelper to refactor tests.
| * | | Add ConnectionHelper to refactor tests.Guo Xiang Tan2014-04-0310-64/+44
| | | |
* | | | Merge branch 'lavrovdv-patch-1'Yves Senn2014-04-033-1/+21
|\ \ \ \
| * | | | Treat blank UUID values as nilDmitry Lavrov2014-04-033-1/+21
| |/ / /
* | | | Merge pull request #14576 from ariabov/scope_sections_reorderingYves Senn2014-04-032-30/+33
|\ \ \ \ | |/ / / |/| | | Change order of scope subsections in Active Record Querying guide [ci skip]
| * | | In Active Record Querying guide, currently `Merging of scopes` section uses ↵ariabov2014-04-022-30/+33
|/ / / | | | | | | | | | | | | | | | a concept of default scope in its example before it is introduced in the following section titled `Applying a default scope`. It makes more sense to switch the ordering to introduce default scopes (`Applying a default scope`) first and then go into `Merging of scopes` section where it is used.
* | | Merge pull request #14564 from killthekitten/patch-2Rafael Mendonça França2014-04-021-5/+4
|\ \ \ | | | | | | | | Fix default_url_options example in i18n guide
| * | | Fix default_url_options example in i18n guide [ci skip]Nikolay Shebanov2014-04-031-5/+4
| | |/ | |/|
* | | Fix cookie serializer docsCarlos Antonio da Silva2014-04-021-3/+3
| | | | | | | | | | | | The option actually needs to be set on action_dispatch. [ci skip]
* | | Move require to actual fileCarlos Antonio da Silva2014-04-022-1/+1
| | | | | | | | | | | | | | | Change to require all active_support/deprecation since that's the actual entry point for the deprecation methods.
* | | Use asert_deprecatedRafael Mendonça França2014-04-021-3/+5
| | |
* | | Merge pull request #14529 from rwz/masterRafael Mendonça França2014-04-023-6/+37
|\ \ \ | | | | | | | | | | | | ActiveSupport::SafeBuffer#prepend inconsistency
| * | | DRY AS::SafeBuffer a bit using existing helperPavel Pravosud2014-04-021-5/+1
| | | |
| * | | Make AS::SafeBuffer#prepend act like String#prependPavel Pravosud2014-03-313-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `#prepend` method modify instance in-place and return self instead of just returning modified value. That is exactly what `#prepend!` method was doing previously, so it's deprecated from now on.
* | | | Merge pull request #14568 from alex88/patch-1Rafael Mendonça França2014-04-021-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fixed upgrade guide typo
| * | | Fixed small documentation typoAlessandro Tagliapietra2014-04-021-1/+1
|/ / / | | | | | | Using `Rails.application.config.cookies_serializer :hybrid` throws an exception, fixed to `=`.
* | | Merge pull request #14565 from rajcybage/conditional_test_casesRafael Mendonça França2014-04-021-7/+5
|\ \ \ | |_|/ |/| | We can conditional define the tests depending on the adapter or connection.
| * | We can conditional define the tests depending on the adapter orRajarshi Das2014-04-021-7/+5
|/ / | | | | | | connection.
* | PostgreSQL, Support for materialized views. [Dave Lee & Yves Senn]Dave Lee2014-04-024-12/+35
| | | | | | | | | | Expand the query used in #table_exists? to include materialized views in the kinds of relations it searches.
* | cleanup, `reset_pg_session` in range_test.rbYves Senn2014-04-021-2/+5
| | | | | | | | | | Also do not use transactional fixtures. We drop the type and the table after every run, so there is nothing for the transaction to clean up.
* | Merge pull request #14550 from tgxworld/fix_failing_enum_test_random_orderYves Senn2014-04-023-9/+21
|\ \ | | | | | | Allow postgresql enum_test to be run in random order.
| * | Allow postgresql enum_test to be run in random order.Guo Xiang Tan2014-04-013-9/+21
| | | | | | | | | | | | Creating and dropping similar tables within the same connection causes postgresql to look up old values in the cache of tables which have already been dropped.
* | | Merge pull request #14560 from abwinkler999/typo-in-RELEASING_RAILSRafael Mendonça França2014-04-021-1/+1
|\ \ \ | |/ / |/| | Changed 'so' to 'see'
| * | Changed 'so' to 'see'Benjamin Winkler2014-04-021-1/+1
|/ /
* | Merge branch 'rmc'Aaron Patterson2014-04-013-30/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | * rmc: push move_string in to `move` combine move_regexp and move_string so we only loop over states once do not create memo objects since we'll just throw them away only ask if `t` is empty once.
| * | push move_string in to `move`Aaron Patterson2014-04-011-14/+12
| | |
| * | combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
| | |
| * | do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
| | |
| * | only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 01:04:59 +0000