Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge pull request #7917 from dfens/master | José Valim | 2012-10-12 | 8 | -8/+8 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Cosmetic changes: remove trailing whitespaces from tests | |||||
| | * | | | | | | | Cleanup trailing whitespaces | dfens | 2012-10-12 | 8 | -8/+8 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #7915 from frodsan/docs_permit | Rafael Mendonça França | 2012-10-11 | 1 | -0/+22 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | update AC::Parameters#permit documentation [ci skip] | |||||
| | * | | | | | | | update AC::Parameters#permit documentation [ci skip] | Francesco Rodriguez | 2012-10-11 | 1 | -0/+22 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | bdd105d changes the behaviour of AC::Parameters#permit. | |||||
| * | | | | | | | When executing permit with just a key that points to a hash, DO NOT allow ↵ | Santiago Pastorino | 2012-10-12 | 2 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all the hash params.require(:person).permit(:projects_attributes) was returning => {"projects_attributes"=>{"0"=>{"name"=>"Project 1"}}} When should return => {} You should be doing ... params.require(:person).permit(projects_attributes: :name) to get just the projects attributes you want to allow | |||||
| * | | | | | | | adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73 | Aaron Patterson | 2012-10-11 | 1 | -0/+14 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #7912 from mrship/master | Rafael Mendonça França | 2012-10-11 | 4 | -1/+8 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | CacheDigests: Support templates in directories several levels deep | |||||
| | * | | | | | | Allow for deep directory path for view templates. | Andy Shipman | 2012-10-11 | 4 | -1/+8 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #7886 from ↵ | Rafael Mendonça França | 2012-10-11 | 5 | -13/+50 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | senny/3675_assert_template_twice_against_same_partial assert_template works when the same partial was rendered multiple times | |||||
| | * | | | | | | refactor `ActionView::TestCase` internals to track rendered locals | Yves Senn | 2012-10-11 | 2 | -20/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this refactoring extracts the semi complex data structure of rendered locals per view into into a separate class | |||||
| | * | | | | | | recognizes when a partial was rendered twice. Closes #3675 | Yves Senn | 2012-10-11 | 5 | -9/+33 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #7908 from arunagw/build_fix_railties | Rafael Mendonça França | 2012-10-11 | 1 | -5/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | No need to test for rack-cache present in gem file | |||||
| | * | | | | | | No need to test for rack-cache present in Gemfile | Arun Agrawal | 2012-10-11 | 1 | -5/+0 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as it's removed here 1fc795468525d8622cdca474a54c8310a514aa46 | |||||
| * | | | | | | Merge pull request #7050 from kytrinyx/documentation-reset-column-info | Vijay Dev | 2012-10-10 | 1 | -0/+21 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Expand the caveat about models in migrations in the rails guide. | |||||
| | * | | | | | | Expand caveat about models in migrations (rails guide) | Katrina Owen | 2012-10-10 | 1 | -0/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an attempt to address issue #6939, where an earlier migration added a column to the database, and a later migration uses a model and references that column. When both migrations were run together with `rake db:migrate` the column information in memory still referenced the old table structure. Running the migrations separately fixed this, as a new connection was then established before referencing the model. Explicitly calling `reset_column_information` is a more reliable workaround. | |||||
| * | | | | | | | Merge pull request #7904 from jfirebaugh/eager_autoload | Rafael Mendonça França | 2012-10-10 | 1 | -10/+14 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Eager autoload Preloader classes | |||||
| | * | | | | | | | Eager autoload Preloader classes | John Firebaugh | 2012-10-10 | 1 | -10/+14 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications. | |||||
| * | | | | | | | Remove the leading :: constant qualifier in the ActiveRecord::Fixtures ↵ | Jeremy Kemper | 2012-10-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecation message | |||||
| * | | | | | | | Upgrade to a jquery-rails that doesn't expect ↵ | Jeremy Kemper | 2012-10-10 | 1 | -1/+1 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | config.action_view.javascript_expansions to exist | |||||
| * | | | | | | Merge pull request #7887 from senny/remove_unused_requires_in_ar_tests | Vijay Dev | 2012-10-10 | 4 | -4/+0 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove duplicated require statements in AR test cases | |||||
| | * | | | | | | remove duplicated require statements in AR test cases | Yves Senn | 2012-10-09 | 4 | -4/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixing build failures | Vijay Dev | 2012-10-11 | 6 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca | |||||
| * | | | | | | | Merge pull request #7898 from olivierlacan/pg_homebrew_instructions | Vijay Dev | 2012-10-10 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Offer instructions for pg gem when installed via Homebrew | |||||
| | * | | | | | | | Offer instructions for pg gem when installed via Homebrew | Olivier Lacan | 2012-10-10 | 1 | -1/+3 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #7890 from AvnerCohen/new_hash_syntax | Vijay Dev | 2012-10-10 | 1 | -9/+9 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Moving to new hash syntax | |||||
| | * | | | | | | | moving to new hash syntax, for discussion before I take the time on full folders | AvnerCohen | 2012-10-09 | 1 | -9/+9 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Changeing some code-styles of the examples & fix a typo on dependent option | Pablo Ifran | 2012-10-22 | 1 | -18/+12 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | ActiveRecord Callbacks ordering examples | Pablo Ifran | 2012-10-19 | 1 | -0/+43 | |
| | | | | | | | | ||||||
* | | | | | | | | include serializers in ActiveModel::Serialization example | Hrvoje Šimić | 2012-10-19 | 1 | -0/+12 | |
| | | | | | | | | ||||||
* | | | | | | | | better examples in ActiveModel readme | Hrvoje Šimić | 2012-10-19 | 1 | -1/+15 | |
| | | | | | | | | ||||||
* | | | | | | | | Corrected the logic in production.rb comment. | Robb Shecter | 2012-10-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | remove assert_valid method from testing guide [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -3/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Change 'branches' to 'branch' [ci skip] | Adam Coffman | 2012-10-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | add a nested attributes example into Strong Parameters documentation [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -6/+31 | |
| | | | | | | | | ||||||
* | | | | | | | | remove some non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -13/+13 | |
| | | | | | | | | ||||||
* | | | | | | | | remove non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -3/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Revert "Change with start of translation in internationalization, this time ↵ | Rafael Mendonça França | 2012-10-17 | 67 | -36402/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with pt_br." This reverts commit 09682e9e7328b1c1466ae87af08f1785a0b5d7e3. Conflicts: guides/source/en/association_basics.md REASON: Translation work can not be done in the docrails repository | |||||
* | | | | | | | | Revert "divided into folder with the language" | Rafael Mendonça França | 2012-10-17 | 56 | -0/+35064 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository | |||||
* | | | | | | | | Fix typos in Association Basics guide | Jaime Iniesta | 2012-10-17 | 1 | -5/+5 | |
| | | | | | | | | ||||||
* | | | | | | | | divided into folder with the language | Rodrigo Martins | 2012-10-17 | 56 | -35064/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Change with start of translation in internationalization, this time with pt_br. | Rodrigo Martins | 2012-10-17 | 66 | -3/+36397 | |
| | | | | | | | | ||||||
* | | | | | | | | Moving code base to 1.9 hash syntax | AvnerCohen | 2012-10-16 | 3 | -7/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Fix formatting errors on the Active Record Validations and Callbacks guide | Jaime Iniesta | 2012-10-15 | 1 | -5/+8 | |
| | | | | | | | | ||||||
* | | | | | | | | fix link bug in contributing page | Cesar Carruitero | 2012-10-15 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Hash syntax to 1.9 style | AvnerCohen | 2012-10-15 | 2 | -3/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Fix formatting on migrations guide | Jaime Iniesta | 2012-10-14 | 1 | -7/+8 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #118 from patriciomacadden/master | Vijay Dev | 2012-10-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix a typo in caching with rails guide | |||||
| * | | | | | | | | Fix a silly typo | Patricio Mac Adden | 2012-10-13 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Update guides/source/contributing_to_ruby_on_rails.md | Arturo Pie | 2012-10-13 | 1 | -1/+1 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | In this section we are actually updating 'my_new_branch' | |||||
* | | | | | | | | 1.9 hash syntax changes | AvnerCohen | 2012-10-13 | 2 | -5/+5 | |
| | | | | | | | |