aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add test coverage for `bin/setup`.Yves Senn2015-05-061-0/+54
| | | | Make sure this script keeps working and has consistent output.
* Merge pull request #20023 from mohnish/patch-1Yves Senn2015-05-062-2/+5
|\ | | | | | | Use the built-in rake tasks
| * Use the built-in rake tasksMohnish Thallavajhula2015-05-041-2/+2
| | | | | | Use the `log:clear` and `tmp:clear` rake tasks in the setup file template
* | Merge pull request #20034 from ↵Santiago Pastorino2015-05-054-4/+4
|\ \ | | | | | | | | | | | | seanlinsley/list-reserved-works-in-generator-error List reserved words in generator error
| * | list reserved words in generator errorSean Linsley2015-05-054-4/+4
|/ /
* | Merge pull request #20032 from ankit8898/guideRafael Mendonça França2015-05-051-1/+1
|\ \ | | | | | | Documentation: Using the real C and R def of Crud [ci skip]
| * | Using the real C and R def of Crud [ci skip]Ankit gupta2015-05-051-1/+1
| | |
* | | Merge pull request #19756 from georgemillo/docsRobin Dupret2015-05-051-17/+26
|\ \ \ | |/ / |/| | fixing English in Rails::Engine docs
| * | fixing English in Rails::Engine docsGeorge Millo2015-04-231-17/+26
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #20031 from trayo/masterZachary Scott2015-05-051-1/+1
|\ \ \ | | | | | | | | Fixes some words missing from the contributing guide [ci skip]
| * | | fixes some words missingTravis Yoder2015-05-041-1/+1
| | | |
* | | | Merge pull request #20030 from ankit8898/grammar_corrRafael Mendonça França2015-05-051-1/+1
|\ \ \ \ | | | | | | | | | | Tiny grammar correction in documentation [ci skip]
| * | | | Tiny grammar correction in documentation [ci skip]Ankit gupta2015-05-051-1/+1
|/ / / /
* | | | use the right assertions.Yves Senn2015-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prompted by: https://github.com/rails/rails/commit/e38dd7bfa4360e241eadf0cf44abdf86ea33a393#commitcomment-11011496 /cc @kuldeepaggarwal
* | | | Merge pull request #20025 from kamipo/dont_use_exec_query_for_performanceMatthew Draper2015-05-052-22/+17
|\ \ \ \ | | | | | | | | | | Use `select_value` for avoid `ActiveRecord::Result` instance creating
| * | | | Use `select_value` for avoid `ActiveRecord::Result` instance creatingRyuta Kamizono2015-05-052-22/+17
| | | | | | | | | | | | | | | | | | | | | | | | | `exec_query` create `ActiveRecord::Result` instance. It is better to use `select_value` instead of `exec_query` for performance.
* | | | | Merge pull request #20024 from ↵Matthew Draper2015-05-051-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/use_select_rows_instead_of_select_one_in_select_values Use `select_rows` instead of `select_one` in `select_value`
| * | | | | Use `select_rows` instead of `select_one` in `select_value`Ryuta Kamizono2015-05-051-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | `select_one` create `ActiveRecord::Result` instance. It is better to use `select_rows` instead of `select_one` for performance.
* | | | | Merge pull request #20019 from imanel/remove_rescue_formatMatthew Draper2015-05-053-16/+9
|\ \ \ \ \ | | | | | | | | | | | | Remove :rescue_format option for translate helper
| * | | | | Remove :rescue_format option for translate helper since it's no longer ↵Bernard Potocki2015-05-043-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | supported by I18n.
* | | | | | Merge pull request #19868 from createdbypete/guides-postgres-uuid-pgcryptoYves Senn2015-05-051-6/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Provide mention of pgcrypto extension for Postgres UUID support [ci skip]
| * | | | | Provide mention of pgcrypto extension for uuidsPeter Rhoades2015-05-041-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the Postgresql 9.4+ docs > If you only need randomly-generated (version 4) UUIDs, consider using the gen_random_uuid() function from the pgcrypto module instead. [ci skip]
* | | | | | Fix constant in void context warningsAndrew White2015-05-051-2/+2
| | | | | |
* | | | | | Fix URI.escape is obsolete warningsAndrew White2015-05-051-1/+1
| |_|_|/ / |/| | | |
* | | | | Put the assertion arguments in the right orderMatthew Draper2015-05-051-1/+1
| |/ / / |/| | |
* | | | Merge pull request #20014 from vngrs/hash_deep_dup_bugMatthew Draper2015-05-052-0/+7
|\ \ \ \ | | | | | | | | | | deep_dup method, remove old key from duplicated hash
| * | | | deep_dup method, remove old key from duplicated hash to avoid unnecessary pairsMehmet Emin İNAÇ2015-05-042-0/+7
| | | | |
* | | | | Merge pull request #19998 from imanel/fix-missing-translationMatthew Draper2015-05-053-4/+24
|\ \ \ \ \ | | | | | | | | | | | | Handle raise flag in translate when both main and default translation is missing.
| * | | | | Handle raise flag in translate when both main and default translation is ↵Bernard Potocki2015-05-043-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | missing. Fixes #19967
* | | | | | Document inline image mailer preview interceptorAndrew White2015-05-045-56/+83
| | | | | | | | | | | | | | | | | | | | | | | | Explain what the interceptor is used for and how to remove it.
* | | | | | Merge pull request #17632 from eugeneius/schema_cache_dump_connection_poolAaron Patterson2015-05-044-2/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Apply schema cache dump when creating connections
| * | | | | Apply schema cache dump when creating connectionsEugene Kenny2015-04-294-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `db:schema:cache:dump` rake task dumps the database schema structure to `db/schema_cache.dump`. If this file is present, the schema details are loaded into the currently checked out connection by a railtie while Rails is booting, to avoid having to query the database for its schema. The schema cache dump is only applied to the initial connection used to boot the application though; other connections from the same pool are created with an empty schema cache, and still have to load the structure of each table directly from the database. With this change, a copy of the schema cache is associated with the connection pool and applied to connections as they are created.
* | | | | | Merge pull request #20006 from vngrs/refactor_test_order_methodRafael Mendonça França2015-05-041-8/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | refactor ActiveSupport::TestCase.test_order method with memoization
| * | | | | | refactor ActiveSupport::TestCase.test_order method with memoizationMehmet Emin İNAÇ2015-05-041-8/+1
| | | | | | |
* | | | | | | Merge pull request #20010 from sikachu/silence-ambiguous-first-argumentMatthew Draper2015-05-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Silence ambiguous first argument warning
| * | | | | | Silence ambiguous first argument warningPrem Sichanugrist2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This silences: actionpack/test/journey/route_test.rb:33: warning: ambiguous first argument; put parentheses or a space even after `/' operator
* | | | | | | Enhance the "Passing Variables to Translations" partEvan Prothro2015-05-041-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more information about passing variables to translation definitions and also merge this part with the "Interpolation" one as the latter didn't bring any new information. Moreover, each one was referring to the other for further information. [ci skip]
* | | | | | | Updates various prose to the i18n guideEvan Prothro2015-05-041-49/+57
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #20007 from zamith/validation-custom-messagesRafael Mendonça França2015-05-042-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adds/Corrects use case for adding an error message
| * | | | | | Adds/Corrects use case for adding an error messageZamith2015-05-042-1/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | I believe this is a use case that was supposed to be supported, and it's a small fix.
* / / / / / Tiny documentation edits [ci skip]Robin Dupret2015-05-043-17/+20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Fix a few typos * Wrap lines to 80 chars * Use `+` instead of `<tt>`
* | | | | Fix railties configuration testAndrew White2015-05-041-2/+2
| | | | |
* | | | | Add support for inline images to mailer previewsAndrew White2015-05-044-9/+64
| | | | | | | | | | | | | | | | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls.
* | | | | Improve display of attachment names in mailer previewsAndrew White2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Display attachment filenames as a comma separated list rather than showing the inspect output for the array.
* | | | | Fix mailer previews with attachmentsAndrew White2015-05-044-7/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the mail gem's own API to locate the correct part. Fixes #14435.
* | | | | Merge pull request #19981 from kbrock/custom_auth_htmlRafael Mendonça França2015-05-033-20/+22
|\ \ \ \ \ | | | | | | | | | | | | Give authentication methods the ability to customize response message.
| * | | | | Give authentication methods the ability to customize response message.Keenan Brock2015-05-033-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | Digest allowed the messages. Add the same feature to basic and token
* | | | | | Merge pull request #18561 from nerdcave/serialization-methods-optionRafael Mendonça França2015-05-033-10/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | method_missing fallback for ActiveModel::Serialization methods option
| * | | | | ensure `method_missing` called for non-existing methods passed toJay Elaraj2015-04-283-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | `ActiveModel::Serialization#serializable_hash`
* | | | | | Fix generator testsRafael Mendonça França2015-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In my machine the output is different
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:09:18 +0000