aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Force sass-rails ~> 4.0.2 to avoid sprockets compatibility errorRafael Mendonça França2014-03-141-1/+1
| | | | See https://github.com/rails/sass-rails/issues/191 for more information
* 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]
| * 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.
| * Make select_all on query cache accept a Relation without binds.Arthur Neves2014-03-134-12/+24
| | | | | | | | | | [fixes #14361] [related #13886]
* | 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`.
| * | 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
|\ \ | | | | | | Add test for deprecation warning for passing an AR object to `exists?`.
| * | Test deprecation warning for passing an ActiveRecord object toLauro Caetano2014-03-131-0/+6
| |/ | | | | | | `exists?`
* / require actions rather than create_fileAaron Patterson2014-03-131-1/+1
|/ | | | | | | thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319
* passing an instance of an AR object to `find` is deprecatedAaron Patterson2014-03-135-6/+13
| | | | please pass the id of the AR object by calling `.id` on the model first.
* passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-135-4/+14
| | | | | Pass the id of the object to the method by calling `.id` on the AR object.
* make tests pass on Ruby 2.2Aaron Patterson2014-03-132-5/+5
| | | | | | Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593
* Use Sqlite3 adapter in examplesJulian Simioni2014-03-121-2/+2
| | | | | | | | | | | | | | | | Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip]
* use the body proxy to freeze headersAaron Patterson2014-03-125-12/+57
| | | | | | avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header
* 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
| | | | | | | | | | | when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352
* Merge pull request #14366 from sukolsak/grammarLauro Caetano2014-03-121-1/+1
|\ | | | | Fix a grammatical error in the i18n guide
| * 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 [skip ci]
| * 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
|\ \ | |/ |/| Add more tests for mysql 5.6 microseconds + Fix tests
| * Change usec to 0 on tests that compare secondsArthur Neves2014-03-121-3/+3
| | | | | | | | | | Avoid rounding problems with `.usec` method rounding the seconds when the field doesn't persist the `.usec` piece.
| * 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 case insensitive collation. Conflicts: activerecord/CHANGELOG.md
| * Only use BINARY for mysql case sensitive uniqueness check when column has a ↵Ryuta Kamizono2013-11-266-6/+62
| | | | | | | | case insensitive collation.
* | Merge pull request #14359 from arthurnn/mysql2_56_franc_secRafael Mendonça França2014-03-125-2/+23
|\ \ | | | | | | MySQL 5.6 Fractional Seconds
| * | 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
| | | | | | | | | | | | | | | You might want to branch it to include this only for 5.6, but passing these values to < 5.6 doesn't cause issues either.
* | | Merge pull request #14291 from laurocaetano/doc-for-original-fullpathYves Senn2014-03-121-0/+7
|\ \ \ | |/ / |/| | Add documentation for original_fullpath. [ci skip]
| * | [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 necessary
| * | | 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.
| * | | Fixes STI when 2+ levels deep.Arthur Neves2014-03-102-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined.
* | | | 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
|\ \ \ \ | | | | | | | | | | Support for PostgreSQL citext data type.
| * | | | register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]lsylvester2014-03-116-2/+89
| | | | | | | | | | | | | | | | | | | | citext makes it possible to use AR Hash finders for case-insensitive matching as sql UPPER/LOWER functions are not needed.
* | | | | Merge pull request #14342 from ↵Jeremy Kemper2014-03-107-110/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | zuhao/eliminate_global_state_leak_in_activemodel_tests Eliminate global state leaks completely in ActiveModel tests
| * | | | | Completely remove potential global state leaks in ActiveModel tests.Zuhao Wan2014-03-117-110/+136
| | | | | | | | | | | | | | | | | | | | | | | | ActiveModel tests can now be run in random order.
* | | | | | Merge pull request #11616 from arunagw/removed-application-command-railsCarlos Antonio da Silva2014-03-102-6/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Removed command "application"
| * | | | | 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
| * | | | minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip]Gary S. Weaver2014-03-101-1/+1
|/ / / /
* | | | Merge pull request #8313 from alan/only_save_changed_has_one_objectsRafael Mendonça França2014-03-103-2/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:08:18 +0000