aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #20034 from seanlinsley/list-reserved-works-in-generator-e...Santiago Pastorino2015-05-054-4/+4
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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 docsGeorge Millo2015-04-231-17/+26
* | | | | | | Merge pull request #20031 from trayo/masterZachary Scott2015-05-051-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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]Ankit gupta2015-05-051-1/+1
|/ / / / / /
* | | | | | use the right assertions.Yves Senn2015-05-051-2/+2
* | | | | | 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 creatingRyuta Kamizono2015-05-052-22/+17
* | | | | | | Merge pull request #20024 from kamipo/use_select_rows_instead_of_select_one_i...Matthew Draper2015-05-051-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Use `select_rows` instead of `select_one` in `select_value`Ryuta Kamizono2015-05-051-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #20019 from imanel/remove_rescue_formatMatthew Draper2015-05-053-16/+9
|\ \ \ \ \ \ \
| * | | | | | | Remove :rescue_format option for translate helper since it's no longer suppor...Bernard Potocki2015-05-043-16/+9
* | | | | | | | Merge pull request #19868 from createdbypete/guides-postgres-uuid-pgcryptoYves Senn2015-05-051-6/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Provide mention of pgcrypto extension for uuidsPeter Rhoades2015-05-041-6/+9
* | | | | | | | 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 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 miss...Bernard Potocki2015-05-043-4/+24
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Document inline image mailer preview interceptorAndrew White2015-05-045-56/+83
* | | | | | | Merge pull request #17632 from eugeneius/schema_cache_dump_connection_poolAaron Patterson2015-05-044-2/+28
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Apply schema cache dump when creating connectionsEugene Kenny2015-04-294-2/+28
* | | | | | | 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 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 warningPrem Sichanugrist2015-05-041-1/+1
* | | | | | | | Enhance the "Passing Variables to Translations" partEvan Prothro2015-05-041-19/+48
* | | | | | | | Updates various prose to the i18n guideEvan Prothro2015-05-041-49/+57
|/ / / / / / /
* | | | | | | 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 messageZamith2015-05-042-1/+7
| |/ / / / / /
* / / / / / / Tiny documentation edits [ci skip]Robin Dupret2015-05-043-17/+20
|/ / / / / /
* | | | | | Fix railties configuration testAndrew White2015-05-041-2/+2
* | | | | | Add support for inline images to mailer previewsAndrew White2015-05-044-9/+64
* | | | | | Improve display of attachment names in mailer previewsAndrew White2015-05-041-1/+1
* | | | | | Fix mailer previews with attachmentsAndrew White2015-05-044-7/+206
* | | | | | 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.Keenan Brock2015-05-033-20/+22
* | | | | | | Merge pull request #18561 from nerdcave/serialization-methods-optionRafael Mendonça França2015-05-033-10/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | ensure `method_missing` called for non-existing methods passed toJay Elaraj2015-04-283-10/+22
* | | | | | | Fix generator testsRafael Mendonça França2015-05-031-1/+1
* | | | | | | Remove unneeded base fileRafael Mendonça França2015-05-032-57/+53
* | | | | | | Remove unused private classesRafael Mendonça França2015-05-032-186/+0
* | | | | | | Merge pull request #20002 from kamipo/more_exercise_create_index_sql_testsRafael Mendonça França2015-05-034-8/+83
|\ \ \ \ \ \ \