aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* activemodel: make .model_name json encodableIan Ker-Seymer2015-02-242-1/+5
* Make TestController available to all test classesRafael Mendonça França2015-02-241-16/+16
* Merge pull request #19060 from iainbeeston/deprecate-skip-action-callbackRafael Mendonça França2015-02-243-2/+28
|\
| * Deprecate `AbstractController::Callbacks#skip_action_callback`Iain Beeston2015-02-243-2/+28
* | rework `disable_referential_integrity` for PostgreSQL.Yves Senn2015-02-243-9/+136
* | Merge pull request #19064 from kamipo/remove_unused_tableRafael Mendonça França2015-02-241-10/+0
|\ \
| * | Remove unused tableRyuta Kamizono2015-02-251-10/+0
* | | Merge pull request #19062 from kamipo/move_back_new_column_definition_into_ta...Rafael Mendonça França2015-02-241-4/+4
|\ \ \ | |/ / |/| |
| * | Move back `new_column_definition` into `TableDefinition`Ryuta Kamizono2015-02-251-4/+4
|/ /
* | Avoid creating an extra hash on the job test adapterCarlos Antonio da Silva2015-02-241-1/+1
* | Merge pull request #19052 from square/testing-singletonRafael Mendonça França2015-02-234-31/+31
|\ \
| * | `ActiveJob::QueueAdapters::TestAdapter` is now a singletonTamir Duberstein2015-02-234-31/+31
* | | Merge pull request #19030 from kamipo/extract_short_hand_column_methodsRafael Mendonça França2015-02-234-110/+173
|\ \ \ | |/ / |/| |
| * | The short-hand methods should be able to define multiple columnsRyuta Kamizono2015-02-232-45/+69
| * | Extract the short-hand methods into `ColumnMethods`Ryuta Kamizono2015-02-232-23/+36
| * | Extract `primary_key` method into `ColumnMethods`Ryuta Kamizono2015-02-224-42/+68
* | | Merge pull request #19038 from tchandy/cleaning_actionpack_testsSantiago Pastorino2015-02-234-41/+3
|\ \ \
| * | | Removing old helper that was necessary for compatibility with Ruby 1.8.xThiago Pradi2015-02-223-18/+3
| * | | Removing unused constants from abstract_unitThiago Pradi2015-02-221-2/+0
| * | | Removing unused controller from abstract_unitThiago Pradi2015-02-221-16/+0
| * | | Removing unused templateThiago Pradi2015-02-221-5/+0
| |/ /
* | | Merge pull request #17631 from kamipo/bigint_pk_supportRafael Mendonça França2015-02-233-0/+35
|\ \ \
| * | | Allow `:limit` option for MySQL bigint primary key supportRyuta Kamizono2015-02-243-0/+35
* | | | Merge pull request #19048 from girasquid/patch-1Abdelkader Boudih2015-02-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo [ci skip]Luke Hutscal2015-02-231-1/+1
|/ / /
* | | some indenting and punctuation fixes. [ci skip]Yves Senn2015-02-234-29/+33
* | | Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestionsRichard Schneeman2015-02-231-3/+1
|\ \ \
| * | | Improve generator name suggestions a bit.ShunsukeAida2015-02-221-3/+1
* | | | Merge pull request #19046 from yui-knk/fix/ormAbdelkader Boudih2015-02-231-1/+1
|\ \ \ \
| * | | | [ci skip] Fix `Object-Relational` to `Object Relational`yui-knk2015-02-241-1/+1
|/ / / /
* | | | Merge pull request #18937 from simi/optional-belongs-toRafael Mendonça França2015-02-2314-10/+166
|\ \ \ \
| * | | | Require `belongs_to` by default.Josef Šimánek2015-02-2114-10/+166
| | |/ / | |/| |
* | | | Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-varRafael Mendonça França2015-02-236-7/+7
|\ \ \ \
| * | | | Changed the AJADAPTER to AJ_ADAPTERJeroen van Baarsen2015-02-226-7/+7
* | | | | Merge pull request #19044 from y-yagi/mime_type_docAbdelkader Boudih2015-02-231-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]yuuji.yaginuma2015-02-231-1/+1
|/ / / /
* | | | Minor guides edits [ci skip]Robin Dupret2015-02-212-24/+23
* | | | Merge pull request #19026 from rousisk/masterRobin Dupret2015-02-211-2/+3
|\ \ \ \
| * | | | Improve wording on find_by note regarding returning only one record [ci skip]Konstantinos Rousis2015-02-211-2/+3
|/ / / /
* | | | [ci skip] Use explicit module namespace in guideKasper Timm Hansen2015-02-211-1/+3
* | | | guides, fully qualify `ApplicationController`. Closes #19024.Yves Senn2015-02-211-1/+1
| |_|/ |/| |
* | | Merge pull request #19023 from trliner/fix_has_secure_token_docsAbdelkader Boudih2015-02-211-2/+2
|\ \ \
| * | | Fix #has_secure_token documentation [ci skip]Tim Liner2015-02-201-2/+2
|/ / /
* | | Merge pull request #17558 from OpenSourceProjects/test_error_messagesRafael Mendonça França2015-02-207-10/+19
|\ \ \
| * | | Error message testing fixFranky W2015-02-207-10/+19
|/ / /
* | | Oops :bomb:Rafael Mendonça França2015-02-201-1/+1
* | | Change the deprecation messages to show the preferred way to work withRafael Mendonça França2015-02-204-12/+12
* | | Fix changelog indent [ci skip]Carlos Antonio da Silva2015-02-201-2/+2
* | | Merge branch 'dilizarov-feature/alias_request_uuid_method_to_request_id'Rafael Mendonça França2015-02-206-10/+22
|\ \ \
| * | | Prefer request_id over uuid and test the aliasRafael Mendonça França2015-02-204-10/+14