aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Support passing the schema name prefix to `conenction.indexes`Grey Baker2015-12-173-9/+24
* Merge pull request #22619 from akshay-vishnoi/grammar-fixesClaudio B2015-12-161-6/+6
|\
| * [ci skip] Fix grammar and sentence framingAkshay Vishnoi2015-12-171-6/+6
* | Merge pull request #22616 from gfvcastro/test-ruby-2-2-4Rafael França2015-12-171-1/+1
|\ \
| * | Test against Ruby 2.2.4 on Travis.Gustavo Villa2015-12-161-1/+1
* | | Merge pull request #22618 from y-yagi/fix_method_name_typoRafael França2015-12-171-1/+1
|\ \ \ | |_|/ |/| |
| * | fix typo in method name [ci skip]yuuji.yaginuma2015-12-171-1/+1
|/ /
* | Revert "Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_...Rafael Mendonça França2015-12-173-5/+11
* | Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_to_updateRafael França2015-12-173-11/+5
|\ \ | |/ |/|
| * `join_to_delete` is same as `join_to_update`Ryuta Kamizono2015-12-173-11/+5
* | Merge pull request #22592 from nwjsmith/disable-logger-message-broadcastsEileen M. Uchitelle2015-12-163-23/+40
|\ \
| * | Add Logger option to disable message broadcastsNate Smith2015-12-163-23/+40
* | | Make sure File.exist? run in the root of the applicationRafael Mendonça França2015-12-161-1/+5
* | | Do not define attributes_with_index as a Thor taskRafael Mendonça França2015-12-161-4/+4
* | | Remove dead codeRafael Mendonça França2015-12-161-4/+0
* | | Don't over-specify types in our testsSean Griffin2015-12-161-1/+0
| |/ |/|
* | Add mysql back to the GemfileSean Griffin2015-12-162-2/+2
* | Fix test failures on WindowsSean Griffin2015-12-162-5/+13
* | Fix documentation about ApplicationRecordRafael Mendonça França2015-12-161-1/+1
* | Merge pull request #22506 from derekprior/dp-redirect_to_back_or_defaultSean Griffin2015-12-165-12/+80
|\ \
| * | Deprecate `redirect_to :back`Derek Prior2015-12-164-21/+31
| * | Add `redirect_back` for safer referrer redirectsDerek Prior2015-12-165-1/+59
* | | Fix test failure on WindowsSean Griffin2015-12-161-6/+10
* | | Merge branch 'sprockets-3'Rafael Mendonça França2015-12-165-58/+40
|\ \ \
| * | | Use sprockets 3 in the Rails 5 releaseRafael Mendonça França2015-12-165-57/+46
* | | | Merge pull request #22556 from imanel/range_prependKasper Timm Hansen2015-12-161-10/+7
|\ \ \ \
| * | | | Use Module.prepend instead of alias_method for Range#to_sBernard Potocki2015-12-161-10/+7
* | | | | Merge pull request #17845 from gsamokovarov/qualified-constRafael França2015-12-163-74/+107
|\ \ \ \ \
| * | | | | Don't leak Object constants in core_ext/module/qualified_constGenadi Samokovarov2015-12-163-74/+107
| | |/ / / | |/| | |
* / | | | Avoid conditionals in the GemfileSean Griffin2015-12-162-6/+16
|/ / / /
* | | | Require a version of bcrypt that works on Windows when neededSean Griffin2015-12-161-1/+5
* | | | Merge pull request #22567 from gsamokovarov/introduce-application-recordRafael França2015-12-1616-134/+200
|\ \ \ \
| * | | | Introduce ApplicationRecord, an Active Record layer supertypeGenadi Samokovarov2015-12-1616-134/+200
* | | | | Add additional platforms for WindowsSean Griffin2015-12-161-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #22605 from tonyta/delete-dead-commentsRafael França2015-12-165-39/+0
|\ \ \ \
| * | | | delete code commented out (and replaced) in e93d0a5Tony Ta2015-12-151-1/+0
| * | | | deletes commented code introduced in f238d495Tony Ta2015-12-151-5/+0
| * | | | deletes commented code introduced in db045db (initial commit)Tony Ta2015-12-152-18/+0
| * | | | deletes commented code introduced in 4673c47dTony Ta2015-12-151-5/+0
| * | | | deletes code commented out in 72160d9fTony Ta2015-12-151-10/+0
* | | | | Ensure we install the database backend gems on WindowsSean Griffin2015-12-161-1/+1
* | | | | Merge pull request #22598 from yui-knk/deprecate_string_callbackRafael França2015-12-168-23/+31
|\ \ \ \ \
| * | | | | Deprecate passing string to define callback.yui-knk2015-12-168-23/+31
* | | | | | Merge pull request #22611 from existent-co-uk/patch-1Rafael França2015-12-161-2/+2
|\ \ \ \ \ \
| * | | | | | Fix a couple of grammatical errors in security.mdExistent Ltd2015-12-161-2/+2
* | | | | | | Merge pull request #22612 from caike/masterEileen M. Uchitelle2015-12-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Mention the correct way to halt callback chainsCarlos Souza2015-12-161-1/+1
|/ / / / / /
* | | | | | Merge branch 'remove-test-case'eileencodes2015-12-159-52/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Run railties generated app tests in test enveileencodes2015-12-151-3/+3
| * | | | | Update test generators to use ActionDispatch::IntegrationTestAbdelkader Boudih2015-12-158-49/+61
|/ / / / /