aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merged pull request #314 from smartinez87/master.Aaron Patterson2011-04-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix #update_attributes api format errorSebastian Martinez2011-04-261-1/+1
|/ / / / / / /
* | | | | | | simplifying buffered logger for easier and slightly more performant codes. pu...Aaron Patterson2011-04-262-10/+5
* | | | | | | Merged pull request #307 from arunagw/master.Aaron Patterson2011-04-264-3/+58
|\ \ \ \ \ \ \
| * | | | | | | Database creation for jdbcpostgresql #jrubyArun Agrawal2011-04-261-1/+1
| * | | | | | | jdbcpostgresql support added into template.Vishnu Atrai2011-04-263-2/+57
* | | | | | | | Merged pull request #311 from joshk/assign_attributes.David Heinemeier Hansson2011-04-260-0/+0
|\ \ \ \ \ \ \ \
* | | | | | | | | Merged pull request #311 from joshk/assign_attributes.Aaron Patterson2011-04-262-4/+49
|\| | | | | | | |
| * | | | | | | | AR update_attributes api is updated to reflect the addition of assign_attributesJosh Kalderimis2011-04-262-4/+49
* | | | | | | | | Merged pull request #312 from joshk/bump_multi_json.Joshua Peek2011-04-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | bump multi_json dependencyJosh Kalderimis2011-04-261-1/+1
* | | | | | | | | Merged pull request #310 from beanieboi/master.Aaron Patterson2011-04-264-2/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added tsvector Datatype SupportBenjamin Fritsch2011-04-264-2/+51
* | | | | | | | | | bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception handle...Sven Fuchs2011-04-263-5/+5
* | | | | | | | | | Updating to use Mail v2.3.0Mikel Lindsaar2011-04-262-6/+6
* | | | | | | | | | Merged pull request #308 from joshk/assign_attributes.José Valim2011-04-253-11/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | deprecated the use of the guard_protected_attributes argument with attributes...Josh Kalderimis2011-04-253-11/+22
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merged pull request #277 from kuinak/master.Aaron Patterson2011-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | ruby 1.9.2 and other ruby implementations may not return the same hash value ...Evan Petrie2011-04-141-1/+1
* | | | | | | | | | Merged pull request #306 from rsim/case_insensitive_uniqueness_validation_fix.Aaron Patterson2011-04-252-2/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not use SQL LIKE operator for case insensitive uniqueness validationRaimonds Simanovskis2011-04-252-2/+29
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merged pull request #309 from arunagw/sass_new.Aaron Patterson2011-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Using sass directly as new version is out.Arun Agrawal2011-04-261-1/+1
|/ / / / / / / / /
* / / / / / / / / added test for number_to_phone with an empty string and area code trueDiego Carrion2011-04-251-0/+1
|/ / / / / / / /
* | | | | | | | Merged pull request #304 from arunagw/jdbcmysql_db_create.Aaron Patterson2011-04-252-1/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed error when running db:create with jdbcmysqlRashmi Yadav2011-04-252-1/+23
* | | | | | | | | Merged pull request #305 from joshk/bump_deprecation.José Valim2011-04-251-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | bump AS deprecation_horizon to 3.2Josh Kalderimis2011-04-251-1/+1
* | | | | | | | | Merged pull request #300 from arunagw/jdbc_test.Aaron Patterson2011-04-254-1/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding jdbcsqlite3 name in comment.Arun Agrawal2011-04-241-1/+1
| * | | | | | | | | Looks more friendly. Arun Agrawal2011-04-241-1/+2
| * | | | | | | | | jdbcsqlite3 support added into template. #jrubyArun Agrawal2011-04-233-1/+26
| * | | | | | | | | Start Adding jdbcmysql support to new rails template.Arun Agrawal2011-04-233-2/+39
* | | | | | | | | | Merged pull request #302 from metaskills/empty_inserts.Aaron Patterson2011-04-253-9/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use existing #empty_insert_statement_value for an insert with no columns.Ken Collins2011-04-243-9/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Fix tests, main_app mounted helper must be defined explicitly now.Piotr Sarnacki2011-04-251-0/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Make ActionController::Base.modules_for_helpers and ActionController::Base.al...Piotr Sarnacki2011-04-253-39/+39
* | | | | | | | | Explicitly define main_app proxyPiotr Sarnacki2011-04-252-2/+5
* | | | | | | | | Add Engine#helpers method which loads all the engine's helpersPiotr Sarnacki2011-04-252-0/+84
* | | | | | | | | Go with latest Sass directlyDavid Heinemeier Hansson2011-04-251-1/+1
* | | | | | | | | Fix tests.José Valim2011-04-252-7/+3
* | | | | | | | | rename test case to better describe use caseDavid Chelimsky2011-04-251-6/+6
* | | | | | | | | No need to check for both full and mountable.Prem Sichanugrist2011-04-251-1/+1
* | | | | | | | | Add `app/assets/images` directory to plugin new generatorPrem Sichanugrist2011-04-252-0/+14
* | | | | | | | | Temporarily disable uglifier until a new version depending on execjs 0.2.0 ca...David Heinemeier Hansson2011-04-242-2/+2
* | | | | | | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2011-04-2414-74/+311
|\| | | | | | | |
| * | | | | | | | minor correction to the AMo mass-assignment security docsJosh Kalderimis2011-04-241-1/+1
| * | | | | | | | added config.active_record.whitelist_attributes which creates an empty whitel...Josh Kalderimis2011-04-244-3/+20
| * | | | | | | | updated the security guide on the updated mass-assignment security scopes add...Josh Kalderimis2011-04-241-1/+26
| * | | | | | | | Added assign_attributes to Active Record which accepts a mass-assignment secu...Josh Kalderimis2011-04-246-27/+132