aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | No sort Hash options in #grouped_options_for_selectSergey Kojin2012-11-273-7/+7
|/ /
* | Merge pull request #8338 from ugisozols/masterCarlos Antonio da Silva2012-11-271-2/+1
|\ \
| * | Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
|/ /
* | Merge pull request #8337 from amatsuda/unshift_html_scannerRafael Mendonça França2012-11-271-1/+1
|\ \
| * | unshift html-scanner into $LOAD_PATH rather than appendAkira Matsuda2012-11-271-1/+1
* | | Merge pull request #8336 from rashmi14yadav/warning_removedCarlos Antonio da Silva2012-11-271-1/+0
|\ \ \ | |/ / |/| |
| * | Unused variable warning removedRashmi Yadav2012-11-271-1/+0
|/ /
* | Merge pull request #8333 from amatsuda/rails_gem_empty_require_pathJosé Valim2012-11-271-0/+1
|\ \
| * | rails gem has no lib directory to requireAkira Matsuda2012-11-271-0/+1
|/ /
* | Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
* | Remove useless check of AR being defined from teardown fixturesCarlos Antonio da Silva2012-11-271-5/+4
* | Refactor generators tests to include test helpers in the parent classCarlos Antonio da Silva2012-11-271-4/+3
* | Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-masterCarlos Antonio da Silva2012-11-263-0/+15
|\ \
| * | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-0/+15
|/ /
* | Merge pull request #7282 from xHire/validates_length_of_fixRafael Mendonça França2012-11-263-2/+57
|\ \
| * | Length validation handles correctly nil. Fix #7180Michal Zima2012-11-263-2/+57
* | | Merge pull request #8324 from steveklabnik/changelog_7997Rafael Mendonça França2012-11-261-1/+1
|\ \ \
| * | | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
* | | | Merge pull request #8323 from steveklabnik/changelog_7997Rafael Mendonça França2012-11-261-0/+2
|\| | |
| * | | Add changelog for #7997.Steve Klabnik2012-11-261-0/+2
|/ / /
* | | Merge pull request #8319 from alindeman/typoCarlos Antonio da Silva2012-11-261-1/+1
|\ \ \
| * | | Corrects typo in test nameAndy Lindeman2012-11-261-1/+1
* | | | Merge pull request #8320 from senny/active_model_log_folderCarlos Antonio da Silva2012-11-261-0/+1
|\ \ \ \
| * | | | log output from activemodel's railtie_test directly to STDOUTYves Senn2012-11-261-0/+1
| | |/ / | |/| |
* | | | Merge pull request #6197 from blakesmith/connection_adapters_without_explain_...Xavier Noria2012-11-263-6/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't run explain on slow queries for database adapters that don't support itBlake Smith2012-11-263-6/+24
|/ / /
* | | Merge pull request #8312 from senny/make_active_model_parts_individually_load...Rafael Mendonça França2012-11-269-21/+14
|\ \ \
| * | | cleanup, removed dispensable `require` statements from `ActiveModel`Yves Senn2012-11-258-12/+5
| * | | cleanup, remove broken whitespaceYves Senn2012-11-254-9/+9
* | | | Improve clarity of routing testsAndrew White2012-11-261-634/+1081
* | | | Require active_model/railtie directly instead of rails/allCarlos Antonio da Silva2012-11-261-3/+3
| |/ / |/| |
* | | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-263-1/+11
|\ \ \
| * | | assert_template: validating option keysRoberto Soares2012-11-253-1/+11
* | | | Merge pull request #8317 from latortuga/cache-digest-opt-outDavid Heinemeier Hansson2012-11-263-1/+38
|\ \ \ \
| * | | | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-253-1/+38
* | | | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-252-2/+12
* | | | | speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-252-2/+11
| |/ / / |/| | |
* | | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-253-1/+19
|\ \ \ \ | |/ / / |/| | |
| * | | `assert_template` fails with empty string.Roberto Soares2012-11-233-9/+12
| * | | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-233-4/+19
* | | | Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-253-0/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't call will_change! for datetime nil->"".Alisdair McDiarmid2012-11-253-0/+21
|/ / /
* | | Merge pull request #8306 from senny/documentation_for_hidden_field_idCarlos Antonio da Silva2012-11-241-0/+5
|\ \ \ | |_|/ |/| |
| * | document :hidden_field_id option for fields_forYves Senn2012-11-241-0/+5
* | | Fix changelog entry about fast_string_to_time fixCarlos Antonio da Silva2012-11-241-2/+2
* | | Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-2/+2
* | | Use merge! in some places to avoid creating extra hashesCarlos Antonio da Silva2012-11-242-4/+4
* | | Simplify scope options recovery by using merge!Carlos Antonio da Silva2012-11-241-6/+1
* | | Normalize scope recovering :blocks option nameCarlos Antonio da Silva2012-11-241-3/+3
* | | Simplify constraints condition in scope when checking for HashCarlos Antonio da Silva2012-11-241-7/+4