aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding first_or_create, first_or_create!, first_or_new and first_or_build to ↵Andrés Mejía2011-08-306-7/+277
| | | | | | | | | | Active Record. This let's you write things like: User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson", :hot => true) Related to #2420.
* adds the asset pipeline guide to the indexXavier Noria2011-08-303-2/+7
|
* Merge pull request #2684 from waynn/patch-2Xavier Noria2011-08-301-4/+4
|\ | | | | Rephrasing to sound more natural, and some grammar fixes.
| * incorporate feedback from vijaydev and dasch to rephrase this to sound more ↵Waynn Lue2011-08-261-4/+4
| | | | | | | | natural, and some grammar fixes.
* | Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracleJon Leighton2011-08-301-1/+7
| | | | | | | | Fix test column names are escaped for oracle
* | Merge pull request #2636 from dasch/document-sprockets-compressorsAaron Patterson2011-08-301-7/+23
|\ \ | | | | | | Document the Sprockets compressors
| * | Document the Sprockets compressorsDaniel Schierbeck2011-08-301-7/+23
|/ / | | | | | | | | | | Add documentation to Sprockets::NullCompressor and Sprockets::LazyCompressor. Also, make LazyCompressor#compressor private, as it isn't part of the public API.
* | let SDoc add a link to the source code in GitHub for each methodXavier Noria2011-08-291-0/+1
| |
* | Fix test failures on 1.8.7, since Object#initialize_dup is not defined there ↵Jon Leighton2011-08-291-1/+0
| | | | | | | | (and this call to super is no essential, so easiest to simply remove)
* | Merge pull request #2720 from biow0lf/masterXavier Noria2011-08-291-4/+4
|\ \ | | | | | | Doc fixes
| * | Documentation fixesIgor Zubkov2011-08-291-4/+4
| | |
* | | Merge pull request #2021 from dasch/more_postgres_utilsAaron Patterson2011-08-293-16/+21
|\ \ \ | | | | | | | | Make #extract_schema_and_table an instance method in Utils
| * | | Make #extract_schema_and_table an instance method in UtilsDaniel Schierbeck2011-07-093-16/+21
| | | | | | | | | | | | | | | | Also, move the utils test into its own test case.
* | | | Move clear_timestamp_attributes into Timestamp moduleJon Leighton2011-08-292-10/+14
| | | |
* | | | The join_nodes must be passed to the JoinDependency initializer and ↵Jon Leighton2011-08-294-13/+20
| | | | | | | | | | | | | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.
* | | | Move the bulk alter table code into the abstract mysql adapter, hence it is ↵Jon Leighton2011-08-293-47/+44
| | | | | | | | | | | | | | | | supported for mysql2 as well now.
* | | | Extract simplified_type into the abstract classJon Leighton2011-08-293-23/+24
| | | |
* | | | Create an AbstractMysqlAdapter to abstract the common code between ↵Jon Leighton2011-08-295-1117/+726
| | | | | | | | | | | | | | | | MysqlAdapter and Mysql2Adapter.
* | | | Merge pull request #2724 from ↵Santiago Pastorino2011-08-281-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | guilleiguaran/avoid-recursive-call-sprockets-helper Avoid extra recursive call in Sprockets helpers
| * | | | Avoid extra recursive call in Sprockets helpersGuillermo Iguaran2011-08-281-2/+2
|/ / / /
* | | | Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-283-0/+27
| | | | | | | | | | | | | | | | Update changelogs for Rails 3.1.0
* | | | fixing typoAaron Patterson2011-08-281-1/+1
| | | |
* | | | Bump rack-cache, rack-test, rack-mount and sprockets upSantiago Pastorino2011-08-281-4/+4
| | | |
* | | | clear and disable query cache when an exception is raised from called middlewareAaron Patterson2011-08-282-1/+33
| |/ / |/| |
* | | Merge pull request #2711 from dasch/patch-3Aaron Patterson2011-08-281-14/+3
|\ \ \ | | | | | | | | Refactor ActionDispatch::Http::UploadedFile
| * | | Refactor ActionDispatch::Http::UploadedFileDaniel Schierbeck2011-08-281-14/+3
|/ / /
* | | deletes spurious arrowXavier Noria2011-08-271-1/+1
| | |
* | | Merge pull request #2714 from vijaydev/docsSantiago Pastorino2011-08-273-15/+19
|\ \ \ | | | | | | | | doc fixes
| * | | doc fixesVijay Dev2011-08-283-15/+19
|/ / /
* | | use sdoc to generate the APIXavier Noria2011-08-272-2/+4
| | |
* | | stop messing with the load path, load path should be adjusted in the test taskAaron Patterson2011-08-261-7/+0
| | |
* | | Merge pull request #2702 from arunagw/removed_unused_varSantiago Pastorino2011-08-261-1/+1
|\ \ \ | | | | | | | | Removed Unused Variable.
| * | | Removed Unused Variable. Arun Agrawal2011-08-261-1/+1
|/ / /
* | | Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8Aaron Patterson2011-08-251-1/+1
|\ \ \ | | | | | | | | Fix failing asset debug test under 1.8
| * | | Fix failing asset debug test under 1.8Guillermo Iguaran2011-08-251-1/+1
|/ / /
* | | Force binary data inserted for a string data type to utf-8 and log anAaron Patterson2011-08-252-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database.
* | | Merge pull request #2681 from guilleiguaran/doc-changesXavier Noria2011-08-252-1/+12
|\ \ \ | | | | | | | | Documentation changes: Assets Pipeline guide and Railties changelog
| * | | Update Debugging Assets section of Assets Pipeline guideGuillermo Iguaran2011-08-251-1/+8
| | | |
| * | | Add missing CHANGELOG entries for RailtiesGuillermo Iguaran2011-08-251-0/+4
| | |/ | |/|
* | | Revert all the stuff to do with disallowing non-public methods for ↵Jon Leighton2011-08-257-194/+3
| | | | | | | | | | | | Module#delegate
* | | Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpersSantiago Pastorino2011-08-251-4/+4
|\ \ \ | | | | | | | | Removing redundant stringify_keys in Sprockets helpers
| * | | Removing redundant stringify_keys in Sprockets helpersGuillermo Iguaran2011-08-251-4/+4
| | | |
* | | | Merge pull request #2695 from dasch/more-debug-assetsAaron Patterson2011-08-251-3/+1
|\ \ \ \ | |/ / / |/| | | Don't require a specific value for the ?debug flag
| * | | Don't require a specific value for the ?debug flagDaniel Schierbeck2011-08-251-3/+1
|/ / / | | | | | | | | | | | | Previously, only "1" and "true" were accepted. This change makes any value, or no value at all, have the same effect.
* | | Yes we need this to pass the test. we are using config.log_level.Arun Agrawal2011-08-251-2/+2
| | | | | | | | | | | | | | | Fix broken test test_copying_migrations(RailtiesTest::EngineTest): NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c>
* | | Merge pull request #2690 from dasch/pretty-debug-assetsAaron Patterson2011-08-251-4/+4
|\ \ \ | | | | | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable
| * | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readableDaniel Schierbeck2011-08-251-4/+4
| |/ /
* | | Merge pull request #2688 from dasch/refactor-asset-debugging-testsAaron Patterson2011-08-252-42/+56
|\ \ \ | | | | | | | | Refactor asset debugging tests
| * | | Move asset debugging tests into a separate test caseDaniel Schierbeck2011-08-252-42/+56
| |/ / | | | | | | | | | | | | | | | | | | Also: - Refactor AssetDebuggingTest. - Use the %r regexp syntax. That way we don't need to escape the /'s.
* | | Merge pull request #2694 from bogdan/internal_validationSantiago Pastorino2011-08-252-1/+1
|\ \ \ | | | | | | | | Moved strict validation changelog entry to right place