Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge pull request #17574 from kamipo/charset_collation_options | Jeremy Kemper | 2015-04-07 | 8 | -19/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add `:charset` and `:collation` options support for MySQL string and text col... | Ryuta Kamizono | 2015-03-06 | 8 | -19/+172 | |
* | | | | | | | | | | | | | | | Merge pull request #19661 from Azdaroth/fields-for-child-index-lambda | Rafael Mendonça França | 2015-04-06 | 3 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Accept lambda as child_index option in #fields_for method | Karol Galanciak | 2015-04-05 | 3 | -1/+26 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19647 from codeout/association_update | Rafael Mendonça França | 2015-04-06 | 2 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fix a regression introduced by removing unnecessary db call when replacing | Shintaro Kojima | 2015-04-04 | 2 | -0/+4 | |
* | | | | | | | | | | | | | | | | Merge pull request #19029 from iainbeeston/skipping-undefined-callbacks | Rafael Mendonça França | 2015-04-06 | 4 | -15/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Raise ArgumentError if an unrecognised callback is skipped | Iain Beeston | 2015-04-03 | 4 | -15/+46 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_run | Rafael Mendonça França | 2015-04-06 | 8 | -33/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Revert "Reduce allocations when running AR callbacks." | Guo Xiang Tan | 2015-03-22 | 8 | -33/+24 | |
* | | | | | | | | | | | | | | | | | No need to document drop_table in the PostgreSQLAdapter | Rafael Mendonça França | 2015-04-06 | 3 | -9/+8 | |
| |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #19671 from nishantmodak/patch-1 | Rafael Mendonça França | 2015-04-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix URL rails-framework-hooks | Nishant Modak | 2015-04-07 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #19668 from y-yagi/notes_default_dir | Rafael Mendonça França | 2015-04-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | correct the directory which rake notes look by default [ci skip] | yuuji.yaginuma | 2015-04-06 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #19670 from vngrs/misspell_of_exist | Kasper Timm Hansen | 2015-04-06 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | change the explanation of :if_exists option [ci skip] | Mehmet Emin İNAÇ | 2015-04-06 | 2 | -2/+2 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19667 from vngrs/drop_table_doc | Santiago Pastorino | 2015-04-06 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | drop_table method documentation for mysql and postgresql adapters [ci skip] | Mehmet Emin İNAÇ | 2015-04-06 | 2 | -0/+19 | |
* | | | | | | | | | | | | | | | | Merge pull request #19666 from mikej/master | Santiago Pastorino | 2015-04-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | fix missing "if" in API docs for ActionController::Parameters#permit | Michael Josephson | 2015-04-06 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Fix ActionPack tests after changes to missing template logger | eileencodes | 2015-04-06 | 2 | -1/+2 | |
* | | | | | | | | | | | | | | | | Merge pull request #19665 from eileencodes/fix-parse_query-method-signature | Eileen M. Uchitelle | 2015-04-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix method signature of `parse_query` to match rack | eileencodes | 2015-04-06 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19377 from sb8244/issue-19036 | David Heinemeier Hansson | 2015-04-06 | 4 | -8/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | head no_content when there is no template or action performed | Stephen Bussey | 2015-04-05 | 4 | -8/+31 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19652 from vngrs/pluralize_foreign_key_table_name_bug | Yves Senn | 2015-04-06 | 4 | -2/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | use singular table name if pluralize_table_names is setted as false while cre... | Mehmet Emin İNAÇ | 2015-04-06 | 3 | -2/+27 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19662 from yui-knk/fix/bind | Matthew Draper | 2015-04-06 | 1 | -47/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | [ci skip] Remove Extensions to `Proc` chapter section | yui-knk | 2015-04-06 | 1 | -47/+0 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #19657 from smadeja/guides-update | Yves Senn | 2015-04-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Update command_tasks source code | Szymon Madeja | 2015-04-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | fix typo in deprecation message. [Robin Dupret] | Yves Senn | 2015-04-05 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Fix a few typos [ci skip] | Robin Dupret | 2015-04-05 | 3 | -12/+14 | |
* | | | | | | | | | | | | | | Merge pull request #19644 from y-yagi/auto_discovery_link_tag_doc | Yves Senn | 2015-04-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | correct output of auto_discovery_link_tag [ci skip] | yuuji.yaginuma | 2015-04-04 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge pull request #19650 from vngrs/fix_for_i18n_documentation | Arthur Nogueira Neves | 2015-04-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | change REQUEST_URI to PATH_INFO | Mehmet Emin İNAÇ | 2015-04-04 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #19649 from aprescott/allow-array-defaults | Matthew Draper | 2015-04-05 | 3 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Allow an array to be a default translation value. | Adam Prescott | 2015-04-04 | 3 | -1/+14 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | / / / / / / / / / / / | Don't invoke sql_runtime if logger is not set to info | eileencodes | 2015-04-04 | 2 | -2/+3 | |
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #19636 from davydovanton/docs-update-link-to-attributes | Kasper Timm Hansen | 2015-04-04 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | [skip ci] Update information about #link_to attributes | Anton Davydov | 2015-04-04 | 1 | -4/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #19429 from mxhold/print_bundle_install_output_line_by_line | Matthew Draper | 2015-04-03 | 2 | -6/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Print `bundle install` output in `rails new` as soon as it's available | Max Holder | 2015-03-28 | 2 | -6/+13 | |
* | | | | | | | | | | | | | | Merge pull request #19625 from strzibny/fix-test-rails-git-layout | Matthew Draper | 2015-04-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Do not depend on Rails git repository layout in ActiveSupport tests | Josef Stribny | 2015-04-02 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge pull request #19627 from koenpunt/patch-1 | Matthew Draper | 2015-04-03 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | remove duplicates | Koen Punt | 2015-04-03 | 1 | -4/+0 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #19616 from brainopia/speed_up_gsub | Jeremy Kemper | 2015-04-01 | 11 | -14/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |