aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* moving check fo scheme-relative URI into is_uri?Chad Krsek2011-04-261-9/+2
|
* asset helpers should understand scheme-relative URLsChad Krsek2011-04-262-2/+24
|
* Revert "asset helpers should understand scheme-relative URLs"Chad Krsek2011-04-252-24/+2
| | | | This reverts commit 057412ce38ead06307a887dca333837a99f84f22.
* asset helpers should understand scheme-relative URLsChad Krsek2011-04-252-2/+24
|
* 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 validation
| * Do not use SQL LIKE operator for case insensitive uniqueness validationRaimonds Simanovskis2011-04-252-2/+29
| | | | | | It can result in wrong results if values contain special % or _ characters. It is safer to use SQL LOWER function and compare for equality.
* | Merged pull request #309 from arunagw/sass_new.Aaron Patterson2011-04-251-1/+1
|\ \ | | | | | | Using sass directly as new version is out.
| * | 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
|/ | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merged pull request #304 from arunagw/jdbcmysql_db_create.Aaron Patterson2011-04-252-1/+23
|\ | | | | Fixed error when running db:create with jdbcmysql
| * 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.2
| * 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
|\ \ | | | | | | Start Adding jdbcmysql support to new rails template.
| * | 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
| | | | | | | | | More will come for jruby app.
* | | 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.
| * | | 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 ↵Piotr Sarnacki2011-04-253-39/+39
| | | | | | | | | | | | ActionController::Base.all_helpers_from_path public methods
* | | 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
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | No need to check for both full and mountable.Prem Sichanugrist2011-04-251-1/+1
| | | | | | | | | | | | All mountable engine are considered `full?` already.
* | | 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 ↵David Heinemeier Hansson2011-04-242-2/+2
| | | | | | | | | | | | can be released (tomorrow?)
* | | 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 ↵Josh Kalderimis2011-04-244-3/+20
| | | | | | | | | | | | whitelist of attributes available for mass assignment for all models in your app
| * | updated the security guide on the updated mass-assignment security scopes ↵Josh Kalderimis2011-04-241-1/+26
| | | | | | | | | | | | addition, and assign_attributes in AR
| * | Added assign_attributes to Active Record which accepts a mass-assignment ↵Josh Kalderimis2011-04-246-27/+132
| | | | | | | | | | | | security scope using the :as option, while also allowing mass-assignment security to be bypassed using :with_protected
| * | AM mass assignment security attr_accessible and attr_protected now allow for ↵Josh Kalderimis2011-04-244-45/+135
| | | | | | | | | | | | | | | | | | | | | | | | scopes using :as => scope eg. attr_accessible :name attr_accessible :name, :admin, :as => :admin
* | | Stop adding actual dummy tests (they clutter up the real ones in a new app), ↵David Heinemeier Hansson2011-04-237-28/+21
|/ / | | | | | | just show how its done
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-2317-67/+98
|\ \ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | copy-edits 0e2644cXavier Noria2011-04-233-3/+3
| | |
| * | copy-edits e2656e0Xavier Noria2011-04-232-3/+3
| | |
| * | copy-edits 3d45964Xavier Noria2011-04-232-2/+2
| | |
| * | copy-edits 2f0dca5Xavier Noria2011-04-231-1/+1
| | |
| * | Added docs for #drop_database on MySQL adapterSebastian Martinez2011-04-222-1/+5
| | |
| * | Grammer fix on note about wildcard routesRonnie Miller2011-04-221-1/+1
| | |
| * | fix block alignmentVijay Dev2011-04-231-2/+3
| | |
| * | fix indentationVijay Dev2011-04-231-13/+13
| | |
| * | add examples for array access methodsVijay Dev2011-04-231-0/+5
| | |
| * | updating to_xml example to new AR apiVijay Dev2011-04-231-2/+2
| | |
| * | Added docs for #disconnect! on adaptersSebastian Martinez2011-04-223-1/+6
| | |
| * | Added missing docs for clear_cache! on adaptersSebastian Martinez2011-04-223-0/+3
| | |