aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Match Dev/Prod parity for Index Pageschneems2013-07-203-3/+5
| | | | | | | With Rails 4 the default index page was moved from a static file `index.html` inside the `public/` folder to an internal controller/view inside of the railties gem. This was to allow use of erb in the default index page and to remove the requirement that new apps must delete a static file to make their index pages work. While this was a good change, the functionality was unexpected to developers who wish to get their apps running in production ASAP. They will create a new app `rails new my app`, start a server to verify it works, then immediately deploy the app to verify that it can start working in production. Unfortunately locally they see a page when they visit `localhost:3000` when they visit their production app they get an error page. We initially anticipated this problem in the original pull request, but did not properly anticipate the severity or quantity of people who would like this functionality. Having a default index page serves as an excellent litmus test for a passed deploy on default apps, and it is very unexpected to have a page work locally, but not on production. This change makes the default index page available in production if the developer has not over-written it by defining their own `root` path inside of routes.
* parent_table is only used internallyAaron Patterson2013-07-161-4/+4
|
* decouple the manager class from building join constraintsAaron Patterson2013-07-162-10/+11
|
* cache the klass member of the reflectionAaron Patterson2013-07-161-8/+10
|
* cache the scope chain on the stack and eliminate `i`Aaron Patterson2013-07-161-7/+4
|
* just push on to the scope chain items. Oops! (thanks @carlosantoniodasilva)Aaron Patterson2013-07-161-2/+1
|
* use Relation#merge to combine scope chain itemsAaron Patterson2013-07-161-6/+6
|
* make sure scope_chain_items has consistent typesAaron Patterson2013-07-161-7/+9
|
* removes the obsolete private method column_methods_hash [Closes #11406]Xavier Noria2013-07-164-43/+28
|
* Skip Rack applications and redirects when generating urlsAndrew White2013-07-166-13/+93
| | | | | | | | | | When generating an unnamed url (i.e. using `url_for` with an options hash) we should skip anything other than standard Rails routes otherwise it will match the first mounted application or redirect and generate a url with query parameters rather than raising an error if the options hash doesn't match any defined routes. Fixes #8018
* Merge pull request #11458 from arunagw/fix_usage_fileCarlos Antonio da Silva2013-07-161-1/+1
|\ | | | | Fixed USAGE file for generator [ci skip]
| * Fixed USAGE file for generator [ci skip]Arun Agrawal2013-07-161-1/+1
|/
* Merge pull request #11435 from kennyj/move_to_query_cacheYves Senn2013-07-162-2/+6
|\ | | | | Move initializing process for @query_cache to QueryCache module.
| * Move initializing process for query cache to ↵kennyj2013-07-162-2/+6
| | | | | | | | ActiveRecord::ConnectionAdapters::QueryCache module.
* | Merge pull request #11120 from awilliams/ar_mysql2_boolean_quotingYves Senn2013-07-164-6/+53
|\| | | | | Fixes AR mysql2 adapter incorrectly casting boolean values
| * Unifies mysql and mysql2 casting of booleansawilliams2013-07-164-6/+53
|/ | | | | Using the mysql2 adapter, boolean values were sometimes being incorrectly cast to 't' or 'f'. This changes the cast to match the mysql adapter behavior, ie 1 and 0.
* `change_column` for PG adapter respects `:array` option.Yves Senn2013-07-163-2/+19
|
* Merge pull request #11419 from simi/generator_generator_testGuillermo Iguaran2013-07-168-1/+72
|\ | | | | Added generated unit test for generator generator.
| * Added generated unit test for generator generator and new test:generators ↵Josef Šimánek2013-07-168-1/+72
|/ | | | rake task included in test:all rake task.
* Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check ↵Guillermo Iguaran2013-07-161-1/+3
| | | | #11457 for details
* save another array allocationAaron Patterson2013-07-151-1/+1
|
* removing useless assingmentAaron Patterson2013-07-151-1/+1
|
* reorder bind parameters when merging relationsAaron Patterson2013-07-153-3/+43
|
* use arel rather than slapping together SQL stringsAaron Patterson2013-07-152-5/+10
|
* Merge pull request #11451 from ↵Yves Senn2013-07-152-0/+8
|\ | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object
| * Do not re-save destroyed association on saving parent objectPaul Nikitochkin2013-07-152-0/+8
| | | | | | | | Closes #11450
* | Merge pull request #11282 from ↵Yves Senn2013-07-153-29/+4
|\ \ | | | | | | | | | | | | arunagw/deprecation-removed-attribute-missing-activerecord Remove deprecated `attribute_missing`.
| * | Remove deprecation warning from attribute_missing Arun Agrawal2013-07-153-29/+4
| |/ | | | | for attributes that are columns.
* | Merge pull request #11448 from arunagw/updated_middleware_testYves Senn2013-07-151-1/+3
|\ \ | |/ |/| No need to add config for x_sendfile_header
| * Added CheckPending middleware in defaultArun Agrawal2013-07-151-0/+4
| | | | | | | | | | | | | | | | | | As this middleware comes by default in a new rails app Added test to check omit for CheckPending when Active Record is not included.
| * No need to add config for x_sendfile_headerArun Agrawal2013-07-151-2/+0
|/ | | | Rack::Sendfile is loaded by default now
* Rack::Sendfile is now included in middleware by default, change tests to ↵Guillermo Iguaran2013-07-151-10/+4
| | | | reflect that
* Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"Santiago Pastorino2013-07-151-3/+1
| | | | | | | | | | This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681. And allows webservers to configure X-Sendfile-Type. Closes #11440 thanks to [@MSch] Conflicts: railties/lib/rails/application.rb
* Merge pull request #11434 from jetthoughts/new_save_transaction_bugfixSantiago Pastorino2013-07-143-3/+23
|\ | | | | Remove extra decrement of transaction level
| * #4566: Remove extra decrement of transaction levelPaul Nikitochkin2013-07-143-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | `rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level.
* | Merge pull request #11439 from ernie/only-scan-strings-for-nodesYves Senn2013-07-142-1/+8
|\ \ | | | | | | Blacklist->whitelist for reference scans in order!
| * | Blacklist->whitelist for reference scans in order!Ernie Miller2013-07-142-1/+8
| |/ | | | | | | | | | | Stop special-casing Arel::Nodes as exempt from reference scanning in order. Instead, only scan order values that are strings for a table reference.
* | re-introduce `select_for_count` private method.Yves Senn2013-07-141-5/+10
| | | | | | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
* | Merge pull request #11437 from kennyj/fix_11393Guillermo Iguaran2013-07-143-1/+11
|\ \ | |/ |/| Fix #11393. Fix default rendered format when calling render method without :content_type option.
| * Fix default rendered format problem when calling render method without ↵kennyj2013-07-153-1/+11
|/ | | | :content_type option. Closes #11393.
* Merge pull request #11433 from arunagw/removed_unused_taskJosé Valim2013-07-141-13/+0
|\ | | | | railties Rakefile tweaks
| * Removed unused require from RakefileArun Agrawal2013-07-141-4/+0
| |
| * Removed unused broken task for update README [ci skip]Arun Agrawal2013-07-141-9/+0
|/
* Merge pull request #11425 from arunagw/actionview_api_generationXavier Noria2013-07-141-8/+7
|\ | | | | Actionview api generation
| * Added actionview in API generation [ci skip]Arun Agrawal2013-07-141-8/+7
| | | | | | CHANGELOG and LICENSE removed as suggested
* | Merge pull request #11431 from ianfleeton/initialization_memoized_typoYves Senn2013-07-141-1/+1
|\ \ | | | | | | memorized -> memoized typo fix [ci skip]
| * | memorized -> memoized typo fix [ci skip]Ian Fleeton2013-07-141-1/+1
|/ / | | | | | | Reverts one line from 457b7ff9
* | Merge pull request #11424 from kennyj/fix_column_defaults_cachingSantiago Pastorino2013-07-133-0/+15
|\ \ | | | | | | Reset @column_defaults when assigning locking_column.
| * | Reset @column_defaults when assigning .kennyj2013-07-143-0/+15
| | |
* | | This is not needed anymore, before_initialize block can access configSantiago Pastorino2013-07-141-1/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 21:48:47 +0000