aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14631 from laurocaetano/fix_count_with_orderSantiago Pastorino2014-04-072-1/+15
|\ | | | | Ignore order when doing count.
| * Ignore order when doing count.Lauro Caetano2014-04-072-1/+15
|/ | | | | | | This is necessary because Postgresql doesn't play nice with ORDER BY and no GROUP BY. Fixes #14621.
* Merge pull request #14609 from evanwhalen/enums_inheritanceRafael Mendonça França2014-04-073-4/+28
|\ | | | | Make enums distinct per class
| * make enums distinct per classEvan Whalen2014-04-073-4/+28
| |
* | Merge pull request #14628 from vipulnsward/remove-flash-test-warningYves Senn2014-04-071-2/+2
|\ \ | | | | | | Remove unused `subclass_controller_with_flash_type_bar` var from flash test.
| * | Remove unused `subclass_controller_with_flash_type_bar` var from flash test.Vipul A M2014-04-071-2/+2
| | |
* | | Merge pull request #14624 from jamox/dev_install_guideYves Senn2014-04-071-1/+14
|\ \ \ | |/ / |/| | Added OS X specific commands to installation guide [ci skip]
| * | Added OS X specific commands to installation guide [ci skip]Jarmo Isotalo2014-04-071-1/+14
| | | | | | | | | | | | Recommended using homebrew for installing MySQL and PostgreSQL
* | | Merge pull request #14626 from ↵Arthur Nogueira Neves2014-04-061-6/+1
|\ \ \ | | | | | | | | | | | | | | | | eileencodes/fix_incorrect_collection_proxy_delete_all_documentation fix CollectionProxy delete_all documentation
| * | | fix CollectionProxy delete_all documentationeileencodes2014-04-061-6/+1
|/ / / | | | | | | | | | | | | | | | | | | This method no longer returns an array of all records that have been removed. Correct documentation to reflect this change. See issue 14546
* | | Merge pull request #14614 from tgxworld/fix_add_flash_types_testYves Senn2014-04-061-6/+15
|\ \ \ | |/ / |/| | Fix setup of adding _flash_types test.
| * | Fix setup of adding _flash_types test.Guo Xiang Tan2014-04-061-6/+15
| |/ | | | | | | | | | | | | Adding flash types to a controller within any of the tests will result in a global state change of the controller under test. This patch will prevent state leaks and allow us to run the test in random order.
* | Merge pull request #14623 from t3chnoboy/masterYves Senn2014-04-061-1/+1
|\ \ | |/ |/| Use SVG version of travis build status badge [ci skip]
| * Use SVG version of travis build status badge [skip ci]Dmitry Mazuro2014-04-061-1/+1
|/
* Merge pull request #14612 from acallaghan/patch-1Arthur Nogueira Neves2014-04-051-1/+1
|\ | | | | W3C CSP document moved to gihub.io URL [ci skip]
| * W3C CSP document moved to gihub.io URL [ci skip]Andy Callaghan2014-04-051-1/+1
|/ | | The old link https://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html is now being soft redirected to this new URL
* Merge pull request #14579 from senny/pg/remove_string_limitRafael Mendonça França2014-04-047-5/+19
|\ | | | | | | | | | | | | PostgreSQL, remove varchar limit. Conflicts: activerecord/CHANGELOG.md
| * test, show current adapter behavior for `add_column limit: nil`.Yves Senn2014-04-041-0/+8
| | | | | | | | | | | | This is an illustration of https://github.com/rails/rails/pull/13435#issuecomment-33789752 Removing the limit from the PG and SQLite adapter solves the issue. MySQL is still affected by the issue.
| * PostgreSQL and SQLite, remove varchar limit. [Vladimir Sazhin & Toms Mikoss ↵Yves Senn2014-04-046-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | & Yves Senn] There is no reason for the PG adapter to have a default limit of 255 on :string columns. See this snippet from the PG docs: Tip: There is no performance difference among these three types, apart from increased storage space when using the blank-padded type, and a few extra CPU cycles to check the length when storing into a length-constrained column. While character(n) has performance advantages in some other database systems, there is no such advantage in PostgreSQL; in fact character(n) is usually the slowest of the three because of its additional storage costs. In most situations text or character varying should be used instead.
* | sprockets-rails was releasedRafael Mendonça França2014-04-041-1/+0
| |
* | Fix the test defining the models in the right placeRafael Mendonça França2014-04-044-15/+16
| |
* | Add CHANGELOG entry for #11650 [ci skip]Rafael Mendonça França2014-04-041-0/+6
| |
* | Merge pull request #11650 from prathamesh-sonpatki/renameRafael Mendonça França2014-04-049-19/+37
|\ \ | | | | | | | | | Renamed private methods _create_record and _update_record
| * | [Active Record] Renamed private methods create_record and update_recordPrathamesh Sonpatki2014-02-209-19/+37
| | | | | | | | | | | | | | | | | | This is to ensure that they are not accidentally called by the app code. They are renamed to _create_record and _update_record respectively. Closes #11645
* | | Declare the assets dependencyRafael Mendonça França2014-04-041-7/+8
| | |
* | | Use sass-rails 4.0.3Rafael Mendonça França2014-04-041-1/+1
| | |
* | | Make possible to use sprockets-rails 2.1Rafael Mendonça França2014-04-042-1/+2
| | |
* | | Merge pull request #14562 from jefflai2/collection_proxyRafael Mendonça França2014-04-044-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CollectionProxy uses the arel of its association's scope. Conflicts: activerecord/CHANGELOG.md
| * | | CollectionProxy uses the arel of its association's scope.Jefferson Lai2014-04-024-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | CollectionProxy should be able to reuse the behavior (methods) of its parent class, but with its own state. This change allows CollectionProxy to use the arel object corresponding to its association's scope.
* | | | Merge pull request #14599 from spagalloco/patch-1Arthur Nogueira Neves2014-04-041-1/+1
|\ \ \ \ | | | | | | | | | | add missing parentheses to validates_with documentation [skip ci]
| * | | | add missing parentheses to validates_with documentation [skip ci]Steve Agalloco2014-04-041-1/+1
|/ / / /
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 14:13:46 +0000