Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | moving check fo scheme-relative URI into is_uri? | Chad Krsek | 2011-04-26 | 1 | -9/+2 |
| | |||||
* | asset helpers should understand scheme-relative URLs | Chad Krsek | 2011-04-26 | 2 | -2/+24 |
| | |||||
* | Revert "asset helpers should understand scheme-relative URLs" | Chad Krsek | 2011-04-25 | 2 | -24/+2 |
| | | | | This reverts commit 057412ce38ead06307a887dca333837a99f84f22. | ||||
* | asset helpers should understand scheme-relative URLs | Chad Krsek | 2011-04-25 | 2 | -2/+24 |
| | |||||
* | Merged pull request #306 from rsim/case_insensitive_uniqueness_validation_fix. | Aaron Patterson | 2011-04-25 | 2 | -2/+29 |
|\ | | | | | Do not use SQL LIKE operator for case insensitive uniqueness validation | ||||
| * | Do not use SQL LIKE operator for case insensitive uniqueness validation | Raimonds Simanovskis | 2011-04-25 | 2 | -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 Patterson | 2011-04-25 | 1 | -1/+1 |
|\ \ | | | | | | | Using sass directly as new version is out. | ||||
| * | | Using sass directly as new version is out. | Arun Agrawal | 2011-04-26 | 1 | -1/+1 |
|/ / | |||||
* / | added test for number_to_phone with an empty string and area code true | Diego Carrion | 2011-04-25 | 1 | -0/+1 |
|/ | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Merged pull request #304 from arunagw/jdbcmysql_db_create. | Aaron Patterson | 2011-04-25 | 2 | -1/+23 |
|\ | | | | | Fixed error when running db:create with jdbcmysql | ||||
| * | Fixed error when running db:create with jdbcmysql | Rashmi Yadav | 2011-04-25 | 2 | -1/+23 |
| | | |||||
* | | Merged pull request #305 from joshk/bump_deprecation. | José Valim | 2011-04-25 | 1 | -1/+1 |
|\ \ | |/ |/| | bump AS deprecation_horizon to 3.2 | ||||
| * | bump AS deprecation_horizon to 3.2 | Josh Kalderimis | 2011-04-25 | 1 | -1/+1 |
| | | |||||
* | | Merged pull request #300 from arunagw/jdbc_test. | Aaron Patterson | 2011-04-25 | 4 | -1/+64 |
|\ \ | | | | | | | Start Adding jdbcmysql support to new rails template. | ||||
| * | | Adding jdbcsqlite3 name in comment. | Arun Agrawal | 2011-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | Looks more friendly. | Arun Agrawal | 2011-04-24 | 1 | -1/+2 |
| | | | |||||
| * | | jdbcsqlite3 support added into template. #jruby | Arun Agrawal | 2011-04-23 | 3 | -1/+26 |
| | | | |||||
| * | | Start Adding jdbcmysql support to new rails template. | Arun Agrawal | 2011-04-23 | 3 | -2/+39 |
| | | | | | | | | | More will come for jruby app. | ||||
* | | | Merged pull request #302 from metaskills/empty_inserts. | Aaron Patterson | 2011-04-25 | 3 | -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 Collins | 2011-04-24 | 3 | -9/+1 |
| | | | | |||||
* | | | | Fix tests, main_app mounted helper must be defined explicitly now. | Piotr Sarnacki | 2011-04-25 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Make ActionController::Base.modules_for_helpers and ↵ | Piotr Sarnacki | 2011-04-25 | 3 | -39/+39 |
| | | | | | | | | | | | | ActionController::Base.all_helpers_from_path public methods | ||||
* | | | Explicitly define main_app proxy | Piotr Sarnacki | 2011-04-25 | 2 | -2/+5 |
| | | | |||||
* | | | Add Engine#helpers method which loads all the engine's helpers | Piotr Sarnacki | 2011-04-25 | 2 | -0/+84 |
| | | | |||||
* | | | Go with latest Sass directly | David Heinemeier Hansson | 2011-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Fix tests. | José Valim | 2011-04-25 | 2 | -7/+3 |
| | | | |||||
* | | | rename test case to better describe use case | David Chelimsky | 2011-04-25 | 1 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | No need to check for both full and mountable. | Prem Sichanugrist | 2011-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | All mountable engine are considered `full?` already. | ||||
* | | | Add `app/assets/images` directory to plugin new generator | Prem Sichanugrist | 2011-04-25 | 2 | -0/+14 |
| | | | |||||
* | | | Temporarily disable uglifier until a new version depending on execjs 0.2.0 ↵ | David Heinemeier Hansson | 2011-04-24 | 2 | -2/+2 |
| | | | | | | | | | | | | can be released (tomorrow?) | ||||
* | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2011-04-24 | 14 | -74/+311 |
|\| | | |||||
| * | | minor correction to the AMo mass-assignment security docs | Josh Kalderimis | 2011-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | added config.active_record.whitelist_attributes which creates an empty ↵ | Josh Kalderimis | 2011-04-24 | 4 | -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 Kalderimis | 2011-04-24 | 1 | -1/+26 |
| | | | | | | | | | | | | addition, and assign_attributes in AR | ||||
| * | | Added assign_attributes to Active Record which accepts a mass-assignment ↵ | Josh Kalderimis | 2011-04-24 | 6 | -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 Kalderimis | 2011-04-24 | 4 | -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 Hansson | 2011-04-23 | 7 | -28/+21 |
|/ / | | | | | | | just show how its done | ||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-23 | 17 | -67/+98 |
|\ \ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | | copy-edits 0e2644c | Xavier Noria | 2011-04-23 | 3 | -3/+3 |
| | | | |||||
| * | | copy-edits e2656e0 | Xavier Noria | 2011-04-23 | 2 | -3/+3 |
| | | | |||||
| * | | copy-edits 3d45964 | Xavier Noria | 2011-04-23 | 2 | -2/+2 |
| | | | |||||
| * | | copy-edits 2f0dca5 | Xavier Noria | 2011-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | Added docs for #drop_database on MySQL adapter | Sebastian Martinez | 2011-04-22 | 2 | -1/+5 |
| | | | |||||
| * | | Grammer fix on note about wildcard routes | Ronnie Miller | 2011-04-22 | 1 | -1/+1 |
| | | | |||||
| * | | fix block alignment | Vijay Dev | 2011-04-23 | 1 | -2/+3 |
| | | | |||||
| * | | fix indentation | Vijay Dev | 2011-04-23 | 1 | -13/+13 |
| | | | |||||
| * | | add examples for array access methods | Vijay Dev | 2011-04-23 | 1 | -0/+5 |
| | | | |||||
| * | | updating to_xml example to new AR api | Vijay Dev | 2011-04-23 | 1 | -2/+2 |
| | | | |||||
| * | | Added docs for #disconnect! on adapters | Sebastian Martinez | 2011-04-22 | 3 | -1/+6 |
| | | | |||||
| * | | Added missing docs for clear_cache! on adapters | Sebastian Martinez | 2011-04-22 | 3 | -0/+3 |
| | | |