aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Rearrange the config merger some moreMatthew Draper2014-04-081-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to simplify the operative part. Most importantly, by pre-loading all the configs supplied in ENV, we ensure the list is complete: if the developer specifies an unknown config, the exception includes a list of valid ones.
| * | | | | entry is always a HashRafael Mendonça França2014-04-081-1/+1
| | | | | |
| * | | | | Check env_url only onceRafael Mendonça França2014-04-081-2/+7
| | | | | |
| * | | | | Only call DEFAULT_ENV proc one timeRafael Mendonça França2014-04-081-2/+5
| | | | | |
| * | | | | Test DATABASE_URL has precendance over DATABASE_URL_#{environment}Rafael Mendonça França2014-04-081-0/+9
| | | | | |
| * | | | | Make sure DEFAULT_URL only override current environment databaseRafael Mendonça França2014-04-082-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | configuration
| * | | | | Only apply DATABASE_URL for Rails.envMatthew Draper2014-04-082-45/+40
|/ / / / / | | | | | | | | | | | | | | | | | | | | As we like ENV vars, also support DATABASE_URL_#{env}, for more obscure use cases.
* | | | | Ensure we are looking with string keysGodfrey Chan2014-04-071-1/+1
| | | | |
* | | | | Follow up to bbe7fe41 to fix enum leakage across classes.Godfrey Chan2014-04-073-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original attempt didn't really fix the problem and wasn't testing the problematic area. This commit corrected those issues in the original commit. Also removed the private `enum_mapping_for` method. As `defined_enums` is now a method, this method doesn't provide much value anymore.
* | | | | Merge pull request #14634 from laurocaetano/fix_reorderRafael Mendonça França2014-04-074-7/+26
|\ \ \ \ \ | | | | | | | | | | | | Build the reverse_order on its proper method.
| * | | | | Build the reverse_order on its proper method.Lauro Caetano2014-04-074-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reverse_order method was using a flag to control if the order should be reversed or not. Instead of using this variable just build the reverse order inside its proper method. This implementation was leading to an unexpected behavior when using reverse_order and then applying reorder(nil). Example: Before Post.order(:name).reverse_order.reorder(nil) # => SELECT "posts".* FROM "posts" ORDER BY "posts"."id" DESC After Post.order(:name).reverse_order.reorder(nil) # => SELECT "posts".* FROM "posts"
* | | | | | Merge pull request #14635 from eileencodes/remove-check-for-presentRafael Mendonça França2014-04-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove check for present? from delete_all method
| * | | | | | remove check for present? from delete_alleileencodes2014-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing in a blank string is a bug so there's no reason to check for a blank string.
* | | | | | | Rails.application should be set inside before_configuration hookRafael Mendonça França2014-04-073-1/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes #14620
* / / / / / Remove useless begin..endCarlos Antonio da Silva2014-04-071-2/+1
|/ / / / /
* | | | | Merge pull request #14632 from matthewd/escape_byteaRafael Mendonça França2014-04-072-2/+19
|\ \ \ \ \ | | | | | | | | | | | | Use connection-specific bytea escaping
| * | | | | Use connection-specific bytea escapingMatthew Draper2014-04-082-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our normal usage, it's rare for this to make a difference... but is more technically correct. As well as a spec that proves this is a good idea, let's also add a more sane-looking one that just covers basic to_sql functionality. There aren't many places where we actually use escape_bytea, but that's one that won't be going away.
* | | | | | 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
|/ / / / / / / /
| | | | | | * | Merge pull request #12016 from roderickvd/uuid_fixesRafael Mendonça França2014-04-0413-10/+149
| |_|_|_|_|/| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generate stable fixture UUIDs on PostgreSQL Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/fixtures.rb activerecord/test/cases/adapters/postgresql/uuid_test.rb activesupport/CHANGELOG.md
| | | | | | * | Auto-generate stable fixture UUIDs on PostgreSQL.Roderick van Domburg2014-01-0714-17/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #11524