aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow custom JDBC urlsschneems2014-03-142-2/+8
* Force sass-rails ~> 4.0.2 to avoid sprockets compatibility errorRafael Mendonça França2014-03-141-1/+1
* Avoid duplicated conditionalsCarlos Antonio da Silva2014-03-141-2/+1
* Merge pull request #14378 from afshinator/masterGodfrey Chan2014-03-131-3/+3
|\
| * Fix probs in sections 5.6 and 5.9; [ci skip]Afshin Mokhtari2014-03-131-3/+3
* | No need to binds be optionalRafael Mendonça França2014-03-131-2/+2
|/
* Merge pull request #14372 from arthurnn/fix_query_cache_bindsRafael Mendonça França2014-03-134-12/+24
|\
| * Make select_all on query cache accept a Relation without binds.Arthur Neves2014-03-134-12/+24
* | Merge pull request #14376 from laurocaetano/test-deprecation-warning-for-findGodfrey Chan2014-03-131-0/+6
|\ \
| * | Add test for deprecation warning for passing an AR object to `find`.Lauro Caetano2014-03-131-0/+6
|/ /
* | Merge pull request #14375 from laurocaetano/test-deprecation-warning-for-existsAaron Patterson2014-03-131-0/+6
|\ \
| * | Test deprecation warning for passing an ActiveRecord object toLauro Caetano2014-03-131-0/+6
| |/
* / require actions rather than create_fileAaron Patterson2014-03-131-1/+1
|/
* passing an instance of an AR object to `find` is deprecatedAaron Patterson2014-03-135-6/+13
* passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-135-4/+14
* make tests pass on Ruby 2.2Aaron Patterson2014-03-132-5/+5
* Use Sqlite3 adapter in examplesJulian Simioni2014-03-121-2/+2
* use the body proxy to freeze headersAaron Patterson2014-03-125-12/+57
* just ask the response for the commit status, we do not need to ask the jarAaron Patterson2014-03-121-1/+1
* only write the jar if the response isn't committedAaron Patterson2014-03-126-10/+57
* Merge pull request #14366 from sukolsak/grammarLauro Caetano2014-03-121-1/+1
|\
| * Fix a grammatical error in the i18n guide [ci skip]sukolsak2014-03-121-1/+1
* | Merge pull request #14364 from why-el/better-docs-for-update-attributeArthur Nogueira Neves2014-03-121-0/+2
|\ \ | |/ |/|
| * Enhance docs for update_attribute [ci-skip]Mohamed Wael Khobalatte2014-03-121-0/+2
* | use method_defined? to check whether or not a method is definedAaron Patterson2014-03-121-1/+1
* | Merge pull request #14363 from arthurnn/usec_tests_mysql56Rafael Mendonça França2014-03-122-3/+10
|\ \ | |/ |/|
| * Change usec to 0 on tests that compare secondsArthur Neves2014-03-121-3/+3
| * Unit test for mysql quote time usecArthur Neves2014-03-121-0/+7
|/
* Merge pull request #13040 from kamipo/case_sensitive_comparisonRafael Mendonça França2014-03-126-6/+62
|\
| * Only use BINARY for mysql case sensitive uniqueness check when column has a c...Ryuta Kamizono2013-11-266-6/+62
* | Merge pull request #14359 from arthurnn/mysql2_56_franc_secRafael Mendonça França2014-03-125-2/+23
|\ \
| * | Changelog entry for mysql56 microsecondsArthur Neves2014-03-121-0/+4
| * | Test microsecond on mysql 5.6Arthur Neves2014-03-123-2/+11
| * | MySQL 5.6 and later supports microsecond precision in datetime.Tatsuhiko Miyagawa2014-03-121-0/+8
* | | Merge pull request #14291 from laurocaetano/doc-for-original-fullpathYves Senn2014-03-121-0/+7
|\ \ \ | |/ / |/| |
| * | [ci skip] Add documentation for original_fullpath.Lauro Caetano2014-03-111-0/+7
* | | Merge pull request #14353 from arthurnn/remove_small_mockRafael Mendonça França2014-03-111-3/+1
|\ \ \
| * | | Remove mocking on save, when not necessaryArthur Neves2014-03-111-3/+1
|/ / /
* | | Merge pull request #14345 from arthurnn/revert_14052Godfrey Chan2014-03-112-3/+16
|\ \ \
| * | | Fixes STI when 2+ levels deep.Arthur Neves2014-03-102-3/+16
* | | | comment why we are modifying global state. [ci skip]Yves Senn2014-03-111-0/+1
* | | | `change_table` supports `citext`. Follow up to #12523.Yves Senn2014-03-112-8/+31
* | | | Merge pull request #12523 from lsylvester/pg_citextYves Senn2014-03-116-2/+89
|\ \ \ \
| * | | | register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]lsylvester2014-03-116-2/+89
* | | | | Merge pull request #14342 from zuhao/eliminate_global_state_leak_in_activemod...Jeremy Kemper2014-03-107-110/+136
|\ \ \ \ \
| * | | | | Completely remove potential global state leaks in ActiveModel tests.Zuhao Wan2014-03-117-110/+136
* | | | | | Merge pull request #11616 from arunagw/removed-application-command-railsCarlos Antonio da Silva2014-03-102-6/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removed unnecessary command "application"Arun Agrawal2014-03-102-6/+5
|/ / / / /
* | | | | Merge pull request #14343 from garysweaver/masterVijay Dev2014-03-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip]Gary S. Weaver2014-03-101-1/+1
|/ / / /