aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #14665 from andrielfn/avoid-uri-parsingRafael Mendonça França2014-04-092-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Avoid URI parsingAndriel Nuernberg2014-04-092-5/+15
| * | | | | | | | | | | | | | 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.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. [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 [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 falseEmily Dobervich2014-04-083-0/+45
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | 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 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Drop in @jeremy's new database.yml template textMatthew Draper2014-04-0913-44/+206
| | * | | | | | | | | | | | Don't deprecate after allMatthew Draper2014-04-092-27/+11
| | * | | | | | | | | | | | Less ambition, more deprecationMatthew Draper2014-04-092-75/+27
| | * | | | | | | | | | | | Ensure we correctly and immediately load all ENV entriesMatthew Draper2014-04-081-0/+21
| | * | | | | | | | | | | | Give a deprecation message even when the lookup failsMatthew Draper2014-04-082-4/+6
| | * | | | | | | | | | | | Rearrange the config merger some moreMatthew Draper2014-04-081-19/+16
| | * | | | | | | | | | | | 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
| | * | | | | | | | | | | | Only apply DATABASE_URL for Rails.envMatthew Draper2014-04-082-45/+40
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | working against arel/collector branchAaron Patterson2014-04-096-8/+10
* | | | | | | | | | | | | wrap the literal value before handing it to arelAaron Patterson2014-04-072-4/+6
* | | | | | | | | | | | | where_values should extract the value of the Casted nodeAaron Patterson2014-04-071-1/+7
* | | | | | | | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-07154-1058/+1942
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #14634 from laurocaetano/fix_reorderRafael Mendonça França2014-04-074-7/+26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Build the reverse_order on its proper method.Lauro Caetano2014-04-074-7/+26