Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #19685 from vngrs/actionview_parent_layout_bug | Rafael Mendonça França | 2015-04-08 | 2 | -8/+31 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix for actionview parent layout bug | Mehmet Emin İNAÇ | 2015-04-08 | 2 | -8/+31 | |
* | | | | | | | Merge pull request #19633 from y00rb/sort_router_parameters_duplicated_keys | Rafael Mendonça França | 2015-04-08 | 4 | -2/+42 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | sort_by instead of sort | Yang Bo | 2015-04-08 | 4 | -2/+42 | |
* | | | | | | | | Merge pull request #19694 from eagletmt/file-store-clear | Rafael Mendonça França | 2015-04-08 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Allow AS::Cache::FileStore#clear without cache directory | Kohei Suzuki | 2015-04-09 | 2 | -0/+7 | |
* | | | | | | | | | Merge pull request #19698 from stemps/master | Rafael Mendonça França | 2015-04-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix documentation for SchemaStatements#add_foreign_key | Simon Stemplinger | 2015-04-08 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #19324 from arthurnn/batch_touch | Arthur Nogueira Neves | 2015-04-08 | 7 | -7/+172 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Batch touch parent records | Arthur Neves | 2015-04-08 | 7 | -7/+172 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'fix_uniqueness_validation_when_value_is_out_of_range' | Sean Griffin | 2015-04-08 | 3 | -0/+32 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix uniqueness validation with out of range value | Andrey Voronkov | 2015-04-08 | 3 | -0/+31 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Avoid to define an initializer after the load_config_initializers | Rafael Mendonça França | 2015-04-07 | 3 | -8/+9 | |
* | | | | | | | | Merge pull request #19677 from treble37/update-docs-ActionDispatch__Request__... | schneems | 2015-04-07 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove new line between doc and method | Bruce Park | 2015-04-07 | 1 | -1/+0 | |
| * | | | | | | | | added docs for ActionDispatch::Request::Session#create | Bruce Park | 2015-04-07 | 1 | -1/+3 | |
* | | | | | | | | | Merge pull request #19680 from vngrs/make_join_model_name_const_private | Rafael Mendonça França | 2015-04-07 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Change join model name constant to private constant | Mehmet Emin İNAÇ | 2015-04-07 | 1 | -3/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | 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 |