aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-093-3/+4
|\ | | | | | | | | | | * master: add services: memcache to travis The `source` option for `has_many => through` should accept String values.
| * Merge pull request #14671 from arthurnn/travis_memcacheRafael Mendonça França2014-04-091-0/+1
| |\ | | | | | | add services: memcache to travis
| | * add services: memcache to travisArthur Neves2014-04-091-0/+1
| |/
| * Merge pull request #14668 from laurocaetano/source_option_with_string_valueAaron Patterson2014-04-092-3/+3
| |\ | | | | | | The :source option for has_many => through should accept String values.
| | * The `source` option for `has_many => through` should accept StringLauro Caetano2014-04-092-3/+3
| |/ | | | | | | | | | | | | | | values. With the changes introduced by 16b70fddd4dc7e7fb7be108add88bae6e3c2509b it was expecting the value to be a Symbol, while it could be also a String value.
* | remove the bind visitor since the collector handles substituting bind valuesAaron Patterson2014-04-092-9/+5
| |
* | push the collectors up to the abstract adapterAaron Patterson2014-04-093-40/+22
| |
* | sqlite3 tests passing againAaron Patterson2014-04-091-7/+8
| |
* | mysql tests are passing againAaron Patterson2014-04-091-1/+7
| |
* | all tests passing on mysql2Aaron Patterson2014-04-092-4/+3
| |
* | working against arel/collector branchAaron Patterson2014-04-094-19/+12
| |
* | fix bind collecting for mysqlAaron Patterson2014-04-093-4/+22
| |
* | add a bind collector, remove the bind visitorAaron Patterson2014-04-093-15/+24
| |
* | remove the bind substitution visitor. to_sql should never return bind valuesAaron Patterson2014-04-093-12/+7
| |
* | use the compile method so we do not have to specify the collectors in this caseAaron Patterson2014-04-092-4/+2
| |
* | Merge branch 'master' into adequaterecordAaron Patterson2014-04-0933-164/+377
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Avoid URI parsing Add missing require so requiring `active_support/cache` works again. depend_on_asset is not required anymore on sprockets-rails 2.1.2 upgrading section for 4.1 is no longer WIP. [ci skip] Expand explanation of how to set secrets.yml. [ci skip] Guides: minor typo fixed [ci skip] Fixed problem where `1.day.eql?(1.day)` is false new CHANGELOGs entries are in the top [ci skip] Updates the maintenance policy with new Rails versions Dont abbreviate that which needs no abbreviation Dont encourage aliases now that we have variants Use short-form for the scaffold render calls and drop the needless test Drop in @jeremy's new database.yml template text Don't deprecate after all Less ambition, more deprecation Ensure we correctly and immediately load all ENV entries Give a deprecation message even when the lookup fails Rearrange the config merger some more entry is always a Hash Check env_url only once ... Conflicts: Gemfile
| * Merge pull request #14665 from andrielfn/avoid-uri-parsingRafael Mendonça França2014-04-092-5/+15
| |\ | | | | | | Avoid URI parsing
| | * Avoid URI parsingAndriel Nuernberg2014-04-092-5/+15
| | | | | | | | | | | | | | | This parsing is unecessary once the Request object already has the needed information.
| * | Merge pull request #14667 from lucasmazza/require-per-thread-registryRafael Mendonça França2014-04-091-0/+1
| |\ \ | | | | | | | | Add missing require so requiring `active_support/cache` works again.
| | * | Add missing require so requiring `active_support/cache` works again.Lucas Mazza2014-04-091-0/+1
| | |/
| * / depend_on_asset is not required anymore on sprockets-rails 2.1.2Rafael Mendonça França2014-04-093-25/+11
| |/
| * Merge pull request #14654 from Alamoz/secret_keyRafael Mendonça França2014-04-091-4/+7
| |\ | | | | | | Expand explanation of how to set secrets.yml.
| | * Expand explanation of how to set secrets.yml. [ci skip]Adrien Lamothe2014-04-081-4/+7
| | |
| * | upgrading section for 4.1 is no longer WIP. [ci skip]Yves Senn2014-04-091-2/+0
| | |
| * | Merge pull request #14653 from vdmgolub/patch-1Arun Agrawal2014-04-091-1/+1
| |\ \ | | | | | | | | Guides: minor typo fixed in Asset Pipeline guide
| | * | Guides: minor typo fixed [ci skip]Vadim Golub2014-04-091-1/+1
| | |/
| * | Merge pull request #14652 from Emily/duration_eqlsGuillermo Iguaran2014-04-083-0/+45
| |\ \ | | |/ | |/| Fixed problem where `1.day.eql?(1.day)` is false
| | * Fixed problem where `1.day.eql?(1.day)` is falseEmily Dobervich2014-04-083-0/+45
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: 1.second.eql?(1.second) #=> false The new `eql?` requires that `other` is an `ActiveSupport::Duration`. This requirement makes `ActiveSupport::Duration`'s behavior consistent with other numeric types in Ruby. 1.eql?(1.0) #=> false 1.0.eql?(1) #=> false 1.second.eql?(1) #=> false (was true) 1.eql?(1.second) #=> false { 1 => "foo", 1.0 => "bar" } #=> { 1 => "foo", 1.0 => "bar" } { 1 => "foo", 1.second => "bar" } # now => { 1 => "foo", 1.second => "bar" } # was => { 1 => "bar" } And though the behavior here hasn't changed, for reference: 1 == 1.0 #=> true 1.0 == 1 #=> true 1 == 1.second #=> true 1.second == 1 #=> true
| * new CHANGELOGs entries are in the top [ci skip]Rafael Mendonça França2014-04-081-4/+4
| |
| * Merge pull request #14647 from matiaskorhonen/updates-maintenance-policyRafael Mendonça França2014-04-082-3/+7
| |\ | | | | | | Updates the maintenance policy with new Rails versions
| | * Updates the maintenance policy with new Rails versionsMatias Korhonen2014-04-082-3/+7
| |/
| * Dont abbreviate that which needs no abbreviationDavid Heinemeier Hansson2014-04-081-2/+2
| |
| * Dont encourage aliases now that we have variantsDavid Heinemeier Hansson2014-04-081-1/+0
| |
| * Use short-form for the scaffold render calls and drop the needless testDavid Heinemeier Hansson2014-04-082-9/+2
| |
| * Merge pull request #14633 from matthewd/narrow_database_urlRafael Mendonça França2014-04-0814-101/+251
| |\ | | | | | | Only apply DATABASE_URL for Rails.env
| | * Drop in @jeremy's new database.yml template textMatthew Draper2014-04-0913-44/+206
| | | | | | | | | | | | | | | In passing, allow multi-word adapters to be referenced in a URL: underscored_name must become hyphened-name.
| | * Don't deprecate after allMatthew Draper2014-04-092-27/+11
| | |
| | * Less ambition, more deprecationMatthew Draper2014-04-092-75/+27
| | | | | | | | | | | | | | | | | | | | | | | | The "DATABASE_URL_*" idea was moving in the wrong direction. Instead, let's deprecate the situation where we end up using ENV['DATABASE_URL'] at all: the Right Way is to explicitly include it in database.yml with ERB.
| | * Ensure we correctly and immediately load all ENV entriesMatthew Draper2014-04-081-0/+21
| | | | | | | | | | | | .. even when the supplied config made no hint that name was relevant.
| | * Give a deprecation message even when the lookup failsMatthew Draper2014-04-082-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the supplied string doesn't contain a colon, it clearly cannot be a database URL. They must have intended to do a key lookup, so even though it failed, give the explanatory deprecation warning, and raise the exception that lists the known configs. Conveniently, this also simplifies our logical behaviour: if the string matches a known configuration, or doesn't contain a colon (and is therefore clearly not a URL), then we output a deprecation warning, and behave exactly as we would if it were a symbol.
| | * 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.
* | working against arel/collector branchAaron Patterson2014-04-096-8/+10
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 08:15:01 +0000