Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merged pull request #311 from joshk/assign_attributes. | Aaron Patterson | 2011-04-26 | 2 | -4/+49 | |
|\| | | | | | | | | | | | | | | | | | | | | AR update_attributes api is updated to reflect the addition of assign_att | |||||
| * | | | | | | AR update_attributes api is updated to reflect the addition of assign_attributes | Josh Kalderimis | 2011-04-26 | 2 | -4/+49 | |
| | | | | | | | ||||||
* | | | | | | | Merged pull request #312 from joshk/bump_multi_json. | Joshua Peek | 2011-04-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | bump multi_json dependency | |||||
| * | | | | | | bump multi_json dependency | Josh Kalderimis | 2011-04-26 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merged pull request #310 from beanieboi/master. | Aaron Patterson | 2011-04-26 | 4 | -2/+51 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added support for tsvector datatype in postgres | |||||
| * | | | | | | | Added tsvector Datatype Support | Benjamin Fritsch | 2011-04-26 | 4 | -2/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Applied Patch from https://rails.lighthouseapp.com/projects/8994/tickets/5577-suport-from-tsvector-data-type-in-postgresql | |||||
* | | | | | | | | bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception ↵ | Sven Fuchs | 2011-04-26 | 3 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handler [#6739 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | | | | | | Updating to use Mail v2.3.0 | Mikel Lindsaar | 2011-04-26 | 2 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to move the require of mail in test/abstract_unit to be after active support to make sure we use ActiveSupport multibyte handlers, otherwise, Mail will load its internal multibyte compat | |||||
* | | | | | | | | Merged pull request #308 from joshk/assign_attributes. | José Valim | 2011-04-25 | 3 | -11/+22 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | deprecated the use of guard_protected_attributes with attributes= in AR | |||||
| * | | | | | | | | deprecated the use of the guard_protected_attributes argument with ↵ | Josh Kalderimis | 2011-04-25 | 3 | -11/+22 | |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | attributes= in AR in favor of assign_attributes(attrs, :without_protection => true) | |||||
* | | | | | | | | Merged pull request #277 from kuinak/master. | Aaron Patterson | 2011-04-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Correct documentation for asset host strategy for 1.9.2 | |||||
| * | | | | | | | ruby 1.9.2 and other ruby implementations may not return the same hash value ↵ | Evan Petrie | 2011-04-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the same string each time. This can result in your static assets being served from different asset hosts, which makes browser caching less effective. Use md5 or some other digest method instead. | |||||
* | | | | | | | | 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 | |
| | | | | | | |