aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | Merge pull request #13411 from schneems/schneems/runner-command-dash-cRafael Mendonça França2013-12-191-5/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make `rails runner` command options more obvious
| * | | | | | Make `rails runner` command options more obviousschneems2013-12-191-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're surrounding the options in angle brackets `<>` as is convention in `curl`: ``` $ curl --help Usage: curl [options...] <url> ``` And then in square brackets `[]` with bars `|` as in `tar`: ``` $ tar --help ... Create: tar -c [options] [<file> | <dir> | @<archive> | -C <dir> ] ``` To further clarify that the command can be used with both, we now show examples: ``` Examples: rails runner 'puts Rails.env' This runs the code `puts Rails.env` after loading the app rails runner path/to/filename.rb This runs the Ruby file located at `path/to/filename.rb` after loading the app ``` This format was taken from the `find` man pages: ``` EXAMPLES The following examples are shown as given to the shell: find / \! -name "*.c" -print Print out a list of all the files whose names do not end in .c. find / -newer ttt -user wnj -print Print out a list of all the files owned by user ``wnj'' that are newer than the file ttt. ``` The the text at the bottom is also shifted to improve readability.
* | | | | | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-12-191-8/+6
| | | | | | |
* | | | | | | Merge pull request #13344 from ccutrer/fix-from-default-selectRafael Mendonça França2013-12-193-1/+26
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | fix default select when from is used
| * | | | | | fix default select when from is usedCody Cutrer2013-12-193-1/+26
|/ / / / / /
* / / / / / Fix indent in PG array testsCarlos Antonio da Silva2013-12-191-5/+5
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Make sure multiline string is not accepted by the regexpRafael Mendonça França2013-12-192-2/+10
| | | | |
* | | | | Make possible to use symbol as the verifier nameRafael Mendonça França2013-12-194-11/+10
| | | | |
* | | | | Change the message verifier argument to verifier_nameRafael Mendonça França2013-12-192-8/+8
| | | | |
* | | | | revises the release notes about message verifiers (second take) [ci skip]Xavier Noria2013-12-191-8/+11
| | | | |
* | | | | Revert "revises the release notes about message verifiers [ci skip]"Xavier Noria2013-12-192-12/+9
| | | | | | | | | | | | | | | | | | | | This reverts commit 293a1a68992ba3e3e80f9f0f685e866ff79bf11a.
* | | | | revises the release notes about message verifiers [ci skip]Xavier Noria2013-12-192-9/+12
| | | | | | | | | | | | | | | | | | | | Example code does not run yet with beta1.
* | | | | Merge pull request #13408 from JuanitoFatas/remove-ttRafael Mendonça França2013-12-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove <tt> tag in 4_1_release notes. [ci skip].
| * | | | | Remove <tt> tag in 4_1_release notes. [ci skip].Juanito Fatas2013-12-201-2/+2
| | | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-2021-28/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Update contributing_to_ruby_on_rails.md"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41ba51f4850a8cd2fe69789011ac33366366d32f. [ci skip]
| * | | | | Revert "Update security.md"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4804fafecdc057988575b4516afe9ca1d5f42fc. [ci skip]
| * | | | | Revert "Fix on-site markdown rendering [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 427db6b9d2b35a72f3c017eb19a2e1e800b0a7a3. [ci skip]
| * | | | | Revert "Underscore in markdown should be escaped with backslash [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b58f3a641795e1777aa3e12a853c34ff512acfb9. Reason: Discussion in https://github.com/rails/docrails/commit/b58f3a641795e1777aa3e12a853c34ff512acfb9 [ci skip]
| * | | | | [ci skip] add `assets.raise_runtime_errors` flagschneems2013-12-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag will be used in multiple places to check for errors during runtime if enabled. Source: https://github.com/rails/sprockets-rails/pull/100
| * | | | | Merge branch 'master' of github.com:rails/docrailsKuldeep Aggarwal2013-12-101-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-12-10588-6771/+10534
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-01301-2671/+3921
| | |\ \ \ \ \ \
| | * | | | | | | fixed a typoaditya-kapoor2013-08-201-1/+1
| | | | | | | | |
| * | | | | | | | fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]Kuldeep Aggarwal2013-12-101-1/+1
| | |_|/ / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 09:27:45 +0000