aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11611 from arunagw/api-generation-avXavier Noria2013-07-261-7/+5
|\
| * Removed excluding vendor from API doc [ci skip]Arun Agrawal2013-07-261-6/+3
| * Excluding action_view/vendor in API [ci skip]Arun Agrawal2013-07-261-1/+2
|/
* Refactor handling of action normalizationMax Shytikov2013-07-261-11/+13
* Be sure to restore the default I18n.locale after changed its value in a testAkira Matsuda2013-07-261-3/+3
* Fix order dependent testsAkira Matsuda2013-07-261-2/+10
* Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-07-262-1/+4
* Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-07-261-1/+1
* Fix order dependent testsAkira Matsuda2013-07-261-0/+4
* Fix order dependent AP testAkira Matsuda2013-07-261-0/+1
* grab executable from rubygemsAaron Patterson2013-07-251-1/+1
* Merge pull request #11598 from Karunakar/flat_map1Rafael Mendonça França2013-07-251-1/+1
|\
| * used flat_map instead of map.flattenKarunakar (Ruby)2013-07-251-1/+1
|/
* Merge pull request #11582 from steveklabnik/add_binSteve Klabnik2013-07-251-1/+1
|\
| * rake -> bin/rakeSteve Klabnik2013-07-241-1/+1
* | Merge pull request #11341 from arunagw/added-missing-actionview-to-installRafael Mendonça França2013-07-252-3/+1
|\ \
| * | Added some description to generate actionview gem [ci skip]Arun Agrawal2013-07-172-3/+1
* | | :scissors: [ci skip]Carlos Antonio da Silva2013-07-251-1/+1
* | | Merge pull request #11591 from ankit8898/typoCarlos Antonio da Silva2013-07-251-1/+1
|\ \ \
| * | | Typo fixAnkit Gupta2013-07-251-1/+1
* | | | Merge pull request #11593 from rajcybage/fix_test_modelsCarlos Antonio da Silva2013-07-252-5/+3
|\ \ \ \
| * | | | change function def self.table_name to self.table_nameRajarshi Das2013-07-252-5/+3
|/ / / /
* / / / More unused associations in AR test modelsAkira Matsuda2013-07-258-13/+0
|/ / /
* | | Clean up unused associations in AR test modelAkira Matsuda2013-07-251-3/+0
* | | Use Ruby 2.0 caller_locations instead of caller if availableAkira Matsuda2013-07-251-2/+7
* | | Privatize non-test methodAkira Matsuda2013-07-251-0/+1
* | | Allow overriding of all headers from passed environment hashAndrew White2013-07-253-5/+42
* | | Merge pull request #11585 from vipulnsward/hstore_changeRafael Mendonça França2013-07-241-6/+3
|\ \ \
| * | | Cleanup task for informing about hstoreVipul A M2013-07-251-6/+3
| | |/ | |/|
* | | Merge pull request #11584 from Peeja/actionmailer-guide-typoRafael Mendonça França2013-07-241-1/+1
|\ \ \ | |/ / |/| |
| * | AM Guide: Should be "different formats".Peter Jaros2013-07-241-1/+1
|/ /
* | Merge pull request #11559 from bughit/11533_to_procJosé Valim2013-07-244-3/+12
|\ \
| * | don't convert mailer default values to procsAlex Tsukernik2013-07-224-3/+12
* | | Merge pull request #11579 from kennyj/refactor_20130724Rafael Mendonça França2013-07-241-10/+9
|\ \ \
| * | | Fix indentation.kennyj2013-07-241-8/+8
| * | | Simplify select_one method.kennyj2013-07-241-2/+1
* | | | Merge pull request #11570 from joelcogen/harmonize_text_field_and_areaRafael Mendonça França2013-07-244-3/+24
|\ \ \ \ | |/ / / |/| | |
| * | | text_area should handle nil value option like text_fieldJoel Cogen2013-07-244-3/+24
|/ / /
* | | Refactor to use flat_mapCarlos Antonio da Silva2013-07-231-3/+3
* | | oops!Aaron Patterson2013-07-231-1/+1
* | | eliminate conditional in JoinHelperAaron Patterson2013-07-232-2/+2
* | | acually get the actual source reflection :cry::gun:Aaron Patterson2013-07-232-9/+17
* | | Merge pull request #11107 from nettsundere/password-confirmation-fixGuillermo Iguaran2013-07-233-2/+18
|\ \ \
| * | | Fix secure_password password_confirmation validationsVladimir Kiselev2013-07-243-2/+18
* | | | stop relying on side effects of const_missingAaron Patterson2013-07-232-7/+13
|/ / /
* | | add a specific factory method rather than using newAaron Patterson2013-07-239-13/+11
* | | Use GeneratedAttribute#column_name if #reference? scaffold_generator in _form...Zachary Scott2013-07-232-0/+29
* | | factory methods should not have side effects.Aaron Patterson2013-07-233-8/+11
* | | extract mutation from generation methodAaron Patterson2013-07-232-4/+6
* | | Merge pull request #11566 from rajcybage/masterRafael Mendonça França2013-07-231-1/+1
|\ \ \