aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11346 from tomykaira/fix_10257Rafael Mendonça França2014-05-202-2/+21
|\ | | | | Check authentication scheme in Basic auth
| * Run login_procedure only when the auth_scheme is validtomykaira2013-07-081-7/+14
| |
| * Check authentication scheme in Basic authtomykaira2013-07-072-1/+13
| | | | | | | | | | | | | | | | | | | | `authenticate_with_http_basic` and its families should check the authentication schema is "Basic". Different schema, such as OAuth2 Bearer should be rejected by basic auth, but it was passing as the test shows. This fixes #10257.
* | Merge pull request #15207 from sgrif/sg-inline-column-helpersRafael Mendonça França2014-05-2010-120/+77
|\ \ | | | | | | Inline typecasting helpers from Column to the appropriate types
| * | Inline typecasting helpers from Column to the appropriate typesSean Griffin2014-05-2010-120/+77
| | |
* | | Merge pull request #15206 from sgrif/sg-type-map-postgresqlRafael Mendonça França2014-05-203-45/+31
|\ \ \ | | | | | | | | Use the generic type map for PostgreSQL OID registrations
| * | | Use the generic type map for PostgreSQL OID registrationsSean Griffin2014-05-203-45/+31
| |/ /
* | | Merge pull request #15204 from sgrif/sg-delegate-predicatesRafael Mendonça França2014-05-2012-24/+44
|\ \ \ | |/ / |/| | Delegate predicate methods to injected type object on Column
| * | Delegate predicate methods to injected type object on ColumnSean Griffin2014-05-2012-24/+44
|/ /
* | remove dead codeAaron Patterson2014-05-201-57/+0
| |
* | cache the formatter on the path objectAaron Patterson2014-05-202-2/+6
| |
* | translate AST to a formatter before url generationAaron Patterson2014-05-202-1/+72
| |
* | Merge pull request #15200 from sgrif/sg-type-map-mysqlRafael Mendonça França2014-05-204-23/+39
|\ \ | | | | | | Use the generic type map object for mysql field lookups
| * | Use the generic type map object for mysql field lookupsSean Griffin2014-05-204-23/+39
|/ /
* | Merge pull request #15191 from camsong/masterYves Senn2014-05-201-2/+8
|\ \ | | | | | | | | | | | | | | | Distinguish rake assets:clobber from rake assets:clean [ci skip]
| * | Distinguish rake assets:clobber from rake assets:cleancam song2014-05-201-2/+5
| | |
* | | Merge pull request #15203 from sgrif/sg-delegate-type-castRafael Mendonça França2014-05-207-75/+7
|\ \ \ | | | | | | | | Replace `type_cast` case statement with delegation
| * | | Replace `type_cast` case statement with delegationSean Griffin2014-05-207-75/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All subclasses of column were now delegating `type_cast` to their injected type object. We can remove the overriding methods, and generalize it on the `Column` class itself. This also enabled us to remove several column classes completely, as they no longer had any meaningful behavior of their own.
* | | | Merge pull request #15187 from v-yarotsky/fix_confusing_delegation_exceptionRafael Mendonça França2014-05-203-26/+20
|\ \ \ \ | | | | | | | | | | Fix confusing exception in ActiveSupport delegation
| * | | | Fix confusing exception in ActiveSupport delegationVladimir Yarotsky2014-05-203-26/+20
| | | | |
* | | | | prepopulate the dispatch cache so we don't need the ThreadSafe cache.Aaron Patterson2014-05-201-7/+9
| | | | |
* | | | | make the each visitor top-down left-rightAaron Patterson2014-05-201-1/+1
| | | | |
* | | | | Merge pull request #15201 from sgrif/sg-types-postgresqlRafael Mendonça França2014-05-204-151/+85
|\ \ \ \ \ | | | | | | | | | | | | Have Postgres OID types inherit from general types
| * | | | | Have Postgres OID types inherit from general typesSean Griffin2014-05-204-151/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using general types where possible. Several more can go away once infinity gets figured out.
* | | | | | fix multiple hash preloads. Fixes #14994Aaron Patterson2014-05-202-6/+14
| | | | | |
* | | | | | Merge pull request #15199 from sgrif/sg-types-mysqlRafael Mendonça França2014-05-201-69/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use general types for mysql fields
| * | | | | Use general types for mysql fieldsSean Griffin2014-05-201-69/+11
|/ / / / /
* | | | | Merge pull request #15198 from sgrif/sg-delegate-type-cast-mysqlYves Senn2014-05-206-53/+72
|\ \ \ \ \ | |/ / / / |/| | | | Delegate type_cast to injected type object in mysql
| * | | | Delegate type_cast to injected type object in mysqlSean Griffin2014-05-206-53/+72
|/ / / /
* | | | Merge pull request #15197 from sgrif/sg-delegate-type-cast-sqlite3Yves Senn2014-05-2011-7/+83
|\ \ \ \ | | | | | | | | | | Delegate `#type_cast` to injected type objects on SQLite3
| * | | | Delegate `#type_cast` to injected type objects on SQLite3Sean Griffin2014-05-2011-7/+83
| | | | |
* | | | | Merge pull request #14965 from eric-chahin/issue_14824Matthew Draper2014-05-203-1/+33
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Fixed the inferred table name of a HABTM auxiliar
| * | | | Fixed the inferred table name for HABTM within a schemaEric Chahin2014-05-203-1/+33
|/ / / / | | | | | | | | | | | | Fixes #14824.
* | | | Merge pull request #15192 from simi/guides-binstubsYves Senn2014-05-2016-108/+108
|\ \ \ \ | |_|/ / |/| | | Use generated binstubs in guides examples. [ci skip]
| * | | Use generated binstubs in guides examples.Josef Šimánek2014-05-2016-108/+108
|/ / / | | | | | | | | | [ci skip]
* | | fix `rake test_sqlite3_mem`.Yves Senn2014-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While running Sqlite3 memory tests I encountered the following error: ``` Finished in 69.416366s, 58.0267 runs/s, 162.3681 assertions/s. 1) Error: ActiveRecord::Migration::ChangeSchemaTest#test_add_column_with_timestamp_type: NoMethodError: undefined method `type' for nil:NilClass /Users/senny/Projects/rails/activerecord/test/cases/migration/change_schema_test.rb:244:in `test_add_column_with_timestamp_type' 4028 runs, 11271 assertions, 0 failures, 1 errors, 1 skips ``` This was because the table `testings` was used in multiple test-cases. This resulted in a wrongly cached schema on `ActiveRecord::Base.schema_chae`. /cc @zuhao
* | | docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn]Yves Senn2014-05-202-4/+15
| | | | | | | | | | | | | | | Closes #15122 Closes #15107
* | | Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2Yves Senn2014-05-201-4/+10
|\ \ \ | | | | | | | | Un-define :to_json for Customer class after stubbing.
| * | | Add using_resouce_with_json to controller.Zuhao Wan2014-05-201-4/+10
| | | |
* | | | Merge pull request #15178 from zuhao/refactor_actionpack_respond_with_testYves Senn2014-05-202-0/+35
|\ \ \ \ | | | | | | | | | | Deregister csv renderer after test to prevent leak.
| * | | | Add ActionController::Renderers.remove.Zuhao Wan2014-05-202-0/+35
| | | | |
* | | | | make the AST go from left to right, rather than right to leftAaron Patterson2014-05-192-45/+48
| |_|/ / |/| | |
* | | | fix escaping in generationAaron Patterson2014-05-191-1/+7
| | | |
* | | | Revert "Rewrite journey routes formatter for performance"Aaron Patterson2014-05-192-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5c224de9e110763ec7a0f01f5b604bcf81f40bfb. Conflicts: actionpack/lib/action_dispatch/journey/visitors.rb 5c224de9e110763ec7a0f01f5b604bcf81f40bfb introduced a bug in the formatter. This commit includes a regression test.
* | | | Merge pull request #15184 from sgrif/sg-remove-timestamp-typeRafael Mendonça França2014-05-1918-47/+52
|\ \ \ \ | | | | | | | | | | Remove :timestamp column type
| * | | | Remove :timestamp column typeSean Griffin2014-05-1918-47/+52
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `:timestamp` type for columns is unused. All database adapters treat them as the same database type. All code in `ActiveRecord` which changes its behavior based on the column's type acts the same in both cases. However, when the type is passed to code that checks for the `:datetime` type, but not `:timestamp` (such as XML serialization), the result is unexpected behavior. Existing schema definitions will continue to work, and the `timestamp` type is transparently aliased to `datetime`.
* | | | Merge pull request #15155 from dskang/digestRafael Mendonça França2014-05-197-23/+47
|\ \ \ \ | | | | | | | | | | Default config.assets.digests to true in development
| * | | | Default config.assets.digests to true in developmentDan Kang2014-05-177-23/+47
| |/ / /
* | | | Fixing test order issuesRafael Mendonça França2014-05-191-2/+8
| | | |
* | | | Merge pull request #10798 from ↵Rafael Mendonça França2014-05-193-1/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jcxplorer/fix-enable_extension-with-table_name_prefix Fix migrations that use enable_extension with table_name_prefix/suffix Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/migration.rb
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 15:51:35 +0000