aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13462 from JuanitoFatas/getting-startedGodfrey Chan2013-12-231-3/+3
|\ | | | | [ci skip] a destroy action in controller, not delete [getting_stated.md].
| * [ci skip] a destroy action in controller, not delete [getting_stated.md].Juanito Fatas2013-12-241-3/+3
|/
* Merge pull request #13427 from schneems/schneems/cannot-connect-postgres-errorYves Senn2013-12-235-0/+40
|\ | | | | Tell how to Create a Database in Error Message
| * Tell how to Create a Database in Error Messageschneems2013-12-235-0/+40
|/ | | | | | | | | | | | | | | | Currently if you attempt to use a database that does not exist you get an error: ``` PG::ConnectionBad FATAL: database "db_error" does not exist ``` The solution is easy, create and migrate your database however new developers may not know these commands by memory. Instead of requiring the developer to search for a solution, tell them how to fix the problem in the error message: ``` ActiveRecord::NoDatabase: FATAL: database "db_error" does not exist Run `$ bin/rake db:create db:migrate` to create your database ``` Active Record should not know about `rake db:migrate` so this additional information needs to come from the railtie. Potential alternative implementation suggestions are welcome.
* Fix comment example in AR enum [ci skip]Carlos Antonio da Silva2013-12-231-1/+1
|
* Merge pull request #13455 from jetthoughts/13445_fix_touch_destroyed_recordYves Senn2013-12-233-1/+22
|\ | | | | On destroying do not touch destroyed belongs to association.
| * On destroying do not touch destroyed belongs to association.Paul Nikitochkin2013-12-233-1/+22
|/ | | | Fixes: #13445
* Merge pull request #13446 from kuldeepaggarwal/resolver-test-casesYves Senn2013-12-231-0/+10
|\ | | | | Resolver test cases
| * added test cases for Resolver#connection_url_to_hashKuldeep Aggarwal2013-12-231-0/+10
| |
* | Merge pull request #13457 from strzalek/add-missing-av-railtieJosé Valim2013-12-231-0/+1
|\ \ | | | | | | Add missing av/railtie require
| * | Add missing av/railtie requireŁukasz Strzałkowski2013-12-221-0/+1
|/ /
* | CHANGELOG entry for #13451. [ci skip]Yves Senn2013-12-221-0/+13
| |
* | Merge pull request #13451 from dmathieu/quoting_non_stringsYves Senn2013-12-222-1/+7
|\ \ | | | | | | Fix typecasting array of integers
| * | fix quoting non-stringsDamien Mathieu2013-12-222-1/+7
|/ / | | | | | | Closes #13444
* | Use the same enum definition in the docs and in the comments [ci skip]Godfrey Chan2013-12-221-6/+6
| |
* | Add comments with urls for email previewsAndrew White2013-12-222-6/+13
|/
* Merge pull request #13443 from schneems/schneems/fix-master-testsGuillermo Iguaran2013-12-213-24/+26
|\ | | | | Fix DB Console tests
| * Use Full path to sqlite database in testsschneems2013-12-222-4/+4
| |
| * Fix DB Console tests schneems2013-12-211-20/+22
|/ | | | | | | | | | | The build is broken: https://travis-ci.org/rails/rails/builds/15824530 This commit fixes it. The problem: Sqlite expects the `database` part to be an absolute path. That prompted this change to be committed to master: https://github.com/rails/rails/commit/fbb79b517f3127ba620fedd01849f9628b78d6ce This change provides correct behavior. Unfortunately tests were introduced in https://github.com/rails/rails/commit/971d5107cd4cd08c22a85d34546f4ba03ed5c925 that were relying on the incorrect behavior. We can avoid the fix by changing to another database url such as `mysql` or `postgresql` In addition to fixing the failure, the assertions are changed so that the "expected" value comes before "actual" value.
* Merge pull request #13438 from vipulnsward/enable-memache-on-travisGuillermo Iguaran2013-12-211-0/+3
|\ | | | | Enable memcached service on travis for running cache tests.
| * Enable memcached service on travis for running cache tests.Vipul A M2013-12-221-0/+3
| |
* | Merge pull request #13436 from robin850/patch-11Guillermo Iguaran2013-12-214-2/+18
|\ \ | | | | | | Add missing changelog entries and fix few typos
| * | Fix few typos in the documentation [ci skip]Robin Dupret2013-12-212-2/+2
| | |
| * | Add a changelog entry for #13326 [ci skip]Robin Dupret2013-12-211-0/+8
| | |
| * | Add a changelog entry for #13363 [ci skip]Robin Dupret2013-12-211-0/+8
| | |
* | | Fix typo [ci skip]Carlos Antonio da Silva2013-12-211-1/+1
| | |
* | | optimizes array conversion in AC::ParametersXavier Noria2013-12-212-2/+17
|/ /
* | refactors AC::Parameters#fetchXavier Noria2013-12-211-10/+3
| | | | | | | | | | | | | | | | AC::Parameters#fetch was refactored in 7171111 to prevent self mutation, but in doing so it hardcodes logic #convert_hashes_to_parameters is supposed to encapsulate. Better leave the delegation, and add a way to avoid mutating self in there.
* | Test with 2.1.0-rc1Guillermo Iguaran2013-12-201-1/+1
| |
* | Merge pull request #13425 from kassio/masterDavid Heinemeier Hansson2013-12-207-8/+39
|\ \ | | | | | | Generates html and text templates for mailers by default.
| * | `html` and `text` templates for mailers by defaultKassio Borges2013-12-207-8/+39
| | |
* | | converts hashes in arrays of unfiltered params to unpermitted params [fixes ↵Xavier Noria2013-12-213-3/+23
| | | | | | | | | | | | #13382]
* | | fix url connections for sqlite3Aaron Patterson2013-12-202-1/+34
|/ /
* | Merge pull request #13422 from rwz/masterRafael Mendonça França2013-12-203-4/+4
|\ \ | | | | | | Bump Jbuilder version to 2.0.0
| * | Bump Jbuilder version to 2.0.0Pavel Pravosud2013-12-203-4/+4
|/ /
* | Merge pull request #13415 from schneems/schneems/database-no-usernameYves Senn2013-12-192-4/+18
|\ \ | | | | | | Do not expect database user with app name to exist
| * | Do not expect database user with app name to existschneems2013-12-192-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default when creating a project with `--database=postgresql` the `config/database.yml` file that is generated has a user specified that is the same as the app name ``` development: adapter: postgresql encoding: unicode database: <%= app_name %>_development pool: 5 username: <%= app_name %> password: ``` This is counterintuitive and would rarely be valid. By default postgres creates a user with the current user name (http://www.postgresql.org/docs/9.3/static/database-roles.html) "it will have the same name as the operating system user that initialized the database cluster": ``` $ whoami schneems ``` If the `username` is left out postgresql will assume that you wish to log in as the default user ``` $ psql -c '\du' List of roles Role name | Attributes | Member of -----------+------------------------------------------------+----------- schneems | Superuser, Create role, Create DB, Replication | {} ``` A good sensible default then for auto generated `database.yml` files is to remove the `username`, and have postgres attempt to connect to the database as the currently logged in user. Instead of submitting with a blank password, don't submit a password.
* | | Fix AS::NumberHelper results with large precisionsKenta Murata & Akira Matsuda2013-12-203-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | before: ActiveSupport::NumberHelper.number_to_rounded '3.14159', precision: 50 => "3.14158999999999988261834005243144929409027099609375" after: ActiveSupport::NumberHelper.number_to_rounded '3.14159', precision: 50 => "3.14159000000000000000000000000000000000000000000000"
* | | Merge pull request #13188 from imanel/skip_deep_mungeJeremy Kemper2013-12-194-0/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add configuration option to optionally disable deep_munge Conflicts: actionpack/CHANGELOG.md
| * | | Add configuration option to optionally disable deep_mungeBernard Potocki2013-12-054-0/+35
| | | |
* | | | Merge pull request #13418 from ma2gedev/update_sass_rails_4_0_0Guillermo Iguaran2013-12-191-1/+1
|\ \ \ \ | | | | | | | | | | Use sass-rails 4.0.0
| * | | | Use sass-rails 4.0.1Takayuki Matsubara2013-12-201-1/+1
|/ / / /
* | | | Merge pull request #13417 from TalkativeTree/comments_changeRichard Schneeman2013-12-191-1/+1
|\ \ \ \ | | | | | | | | | | fix CollectionAssociation's comments
| * | | | change CollectionAssociation's comments to say Association instead of ↵Ben Angel2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | AssociationProxy to match changes for 3.1 removing Association proxy.
* | | | | Merge pull request #13326 from schneems/schneems/add-asset-flagGuillermo Iguaran2013-12-192-0/+32
|\ \ \ \ \ | | | | | | | | | | | | Flag `config.assets.raise_runtime_errors` in dev
| * | | | | Flag `config.assets.raise_runtime_errors` in devschneems2013-12-192-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default `config.assets.raise_runtime_errors` should be set to `true` in development for new apps. Source: https://github.com/rails/sprockets-rails/pull/100
* | | | | | Merge pull request #13357 from taryneast/masterLauro Caetano2013-12-191-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Describe precision + scale in migrations guide
| * | | | | | [ci skip] Describe precision + scale in migrationsTaryn East2013-12-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telling somebody that "precision sets the precision" is not very helpful. Newbies want to know what precision is *for*, likewise with scale. So I've added a very brief description for each.
* | | | | | | Merge pull request #13412 from arthurnn/quote_id_not_idRafael Mendonça França2013-12-192-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | quoting: Check if id is a valid method before using it
| * | | | | | | quoting: Check if id is a valid method before using itArthur Neves2013-12-192-1/+10
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Need to check if valud also respond_to :id before calling it, otherwise things could explode.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 16:26:01 +0000