Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #19055 from ianks/model_name.to_json | Rafael Mendonça França | 2015-02-24 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | activemodel: make .model_name json encodable | Ian Ker-Seymer | 2015-02-24 | 2 | -1/+5 | |
* | | | | | | | | | | | | Use other controller instead of sharing the controller | Rafael Mendonça França | 2015-02-24 | 1 | -18/+17 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Make TestController available to all test classes | Rafael Mendonça França | 2015-02-24 | 1 | -16/+16 | |
* | | | | | | | | | | | Merge pull request #19060 from iainbeeston/deprecate-skip-action-callback | Rafael Mendonça França | 2015-02-24 | 3 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Deprecate `AbstractController::Callbacks#skip_action_callback` | Iain Beeston | 2015-02-24 | 3 | -2/+28 | |
* | | | | | | | | | | | | rework `disable_referential_integrity` for PostgreSQL. | Yves Senn | 2015-02-24 | 3 | -9/+136 | |
* | | | | | | | | | | | | Merge pull request #19064 from kamipo/remove_unused_table | Rafael Mendonça França | 2015-02-24 | 1 | -10/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove unused table | Ryuta Kamizono | 2015-02-25 | 1 | -10/+0 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #19062 from kamipo/move_back_new_column_definition_into_ta... | Rafael Mendonça França | 2015-02-24 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Move back `new_column_definition` into `TableDefinition` | Ryuta Kamizono | 2015-02-25 | 1 | -4/+4 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Avoid creating an extra hash on the job test adapter | Carlos Antonio da Silva | 2015-02-24 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #19052 from square/testing-singleton | Rafael Mendonça França | 2015-02-23 | 4 | -31/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | `ActiveJob::QueueAdapters::TestAdapter` is now a singleton | Tamir Duberstein | 2015-02-23 | 4 | -31/+31 | |
* | | | | | | | | | | | | Merge pull request #19030 from kamipo/extract_short_hand_column_methods | Rafael Mendonça França | 2015-02-23 | 4 | -110/+173 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | The short-hand methods should be able to define multiple columns | Ryuta Kamizono | 2015-02-23 | 2 | -45/+69 | |
| * | | | | | | | | | | | Extract the short-hand methods into `ColumnMethods` | Ryuta Kamizono | 2015-02-23 | 2 | -23/+36 | |
| * | | | | | | | | | | | Extract `primary_key` method into `ColumnMethods` | Ryuta Kamizono | 2015-02-22 | 4 | -42/+68 | |
* | | | | | | | | | | | | Merge pull request #19038 from tchandy/cleaning_actionpack_tests | Santiago Pastorino | 2015-02-23 | 4 | -41/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Removing old helper that was necessary for compatibility with Ruby 1.8.x | Thiago Pradi | 2015-02-22 | 3 | -18/+3 | |
| * | | | | | | | | | | | | Removing unused constants from abstract_unit | Thiago Pradi | 2015-02-22 | 1 | -2/+0 | |
| * | | | | | | | | | | | | Removing unused controller from abstract_unit | Thiago Pradi | 2015-02-22 | 1 | -16/+0 | |
| * | | | | | | | | | | | | Removing unused template | Thiago Pradi | 2015-02-22 | 1 | -5/+0 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #17631 from kamipo/bigint_pk_support | Rafael Mendonça França | 2015-02-23 | 3 | -0/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Allow `:limit` option for MySQL bigint primary key support | Ryuta Kamizono | 2015-02-24 | 3 | -0/+35 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #19048 from girasquid/patch-1 | Abdelkader Boudih | 2015-02-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix typo [ci skip] | Luke Hutscal | 2015-02-23 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | some indenting and punctuation fixes. [ci skip] | Yves Senn | 2015-02-23 | 4 | -29/+33 | |
* | | | | | | | | | | | Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestions | Richard Schneeman | 2015-02-23 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Improve generator name suggestions a bit. | ShunsukeAida | 2015-02-22 | 1 | -3/+1 | |
* | | | | | | | | | | | | Merge pull request #19046 from yui-knk/fix/orm | Abdelkader Boudih | 2015-02-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | [ci skip] Fix `Object-Relational` to `Object Relational` | yui-knk | 2015-02-24 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #18937 from simi/optional-belongs-to | Rafael Mendonça França | 2015-02-23 | 14 | -10/+166 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Require `belongs_to` by default. | Josef Šimánek | 2015-02-21 | 14 | -10/+166 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-var | Rafael Mendonça França | 2015-02-23 | 6 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Changed the AJADAPTER to AJ_ADAPTER | Jeroen van Baarsen | 2015-02-22 | 6 | -7/+7 | |
* | | | | | | | | | | | | | Merge pull request #19044 from y-yagi/mime_type_doc | Abdelkader Boudih | 2015-02-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip] | yuuji.yaginuma | 2015-02-23 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Minor guides edits [ci skip] | Robin Dupret | 2015-02-21 | 2 | -24/+23 | |
* | | | | | | | | | | | | Merge pull request #19026 from rousisk/master | Robin Dupret | 2015-02-21 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Improve wording on find_by note regarding returning only one record [ci skip] | Konstantinos Rousis | 2015-02-21 | 1 | -2/+3 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | [ci skip] Use explicit module namespace in guide | Kasper Timm Hansen | 2015-02-21 | 1 | -1/+3 | |
* | | | | | | | | | | | | guides, fully qualify `ApplicationController`. Closes #19024. | Yves Senn | 2015-02-21 | 1 | -1/+1 | |
| |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #19023 from trliner/fix_has_secure_token_docs | Abdelkader Boudih | 2015-02-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix #has_secure_token documentation [ci skip] | Tim Liner | 2015-02-20 | 1 | -2/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #17558 from OpenSourceProjects/test_error_messages | Rafael Mendonça França | 2015-02-20 | 7 | -10/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Error message testing fix | Franky W | 2015-02-20 | 7 | -10/+19 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Oops :bomb: | Rafael Mendonça França | 2015-02-20 | 1 | -1/+1 | |
* | | | | | | | | | | | Change the deprecation messages to show the preferred way to work with | Rafael Mendonça França | 2015-02-20 | 4 | -12/+12 | |
* | | | | | | | | | | | Fix changelog indent [ci skip] | Carlos Antonio da Silva | 2015-02-20 | 1 | -2/+2 |