github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,773 Commits 34 Branches 105 Tags
7edade337e968fb028b2b6abfa579120eb424039
Commit Graph

26773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
7edade337e Make read_attribute code path accessible at the class level 2011-12-22 19:24:16 +00:00
Aaron Patterson
89e2647da6 Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable 
* '3-2-stable' of github.com:rails/rails:
  [docs] added missing "}" fixes #4126
 2011-12-22 12:21:57 -07:00
Aaron Patterson
c0563cec6d Revert "Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*" 
This reverts commit 4d20de8a50.
 2011-12-22 12:21:29 -07:00
Piotr Sarnacki
278a72ecea Merge pull request #4128 from arunagw/doc_fixes_3_2-stable 
Doc fixes 3 2 stable
 2011-12-22 02:03:58 -08:00
Arun Agrawal
8dc892618e [docs] added missing "}" fixes #4126 2011-12-22 12:36:15 +05:30
Aaron Patterson
1945bafba2 just require things once 2011-12-21 15:04:00 -07:00
Aaron Patterson
476dce4fc4 append puts the routes after the default, which causes a 404. instead use prepend 2011-12-21 15:03:56 -07:00
Lucas Mazza
b5bb3f8558 raises an ArgumentError if no valid options are given to TemplateRenderer#determine_template 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-12-21 21:17:17 +01:00
Jakub Kuźma
2d07c60b68 added failing tests for has_many, has_one and belongs_to associations with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-12-21 21:17:06 +01:00
Jeremy Kemper
108e34466c Move SubTestTask. Soften up tests. 2011-12-21 12:44:41 -07:00
Aaron Patterson
d5ccb5cf65 adding integration test for journey #7 2011-12-21 11:46:59 -07:00
Aaron Patterson
79778ffac5 caches should not be global, so no need to clear in the teardown 2011-12-21 11:46:53 -07:00
Jeremy Kemper
e85484814c Rails::SubTestTask warns on test failure and moves on. Renamed from TestTaskWithoutDescription. 
This makes it easier to add your own tests to the default suite:

  namespace :test do
    task run: 'test:acceptance'

    Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
      t.libs << 'test'
      t.pattern = 'test/acceptance/**/*_test.rb'
    end
  end

Now `rake` runs unit, functional, integration, and acceptance tests.
 2011-12-21 10:15:39 -07:00
Hendy Tanata
efb75f774a Doc fixes on Rails::Generators::Base.hook_for. 2011-12-21 22:28:34 +05:30
José Valim
a2f5df526c Merge pull request #4080 from heimidal/3-2-stable 
Fix regression in select form helper when options are non-string values
 2011-12-20 13:48:34 -08:00
Brian Rose
a1b2dbd7d4 Check for response to #last instead of #first. 2011-12-20 13:38:16 -07:00
Brian Rose
bd89946dd3 Ensure option for select helper responds to #first before comparison. 2011-12-20 13:26:10 -07:00
Santiago Pastorino
cf2d31ab0b Merge pull request #4069 from arunagw/issue_4067 
It should be README.rdoc
 2011-12-20 10:17:40 -08:00
Arun Agrawal
490c00baeb It should be README.rdoc fixes #4067 2011-12-20 23:36:03 +05:30
José Valim
437f1e0af1 Merge pull request #4064 from nashby/date-helper-field-error-proc 
fix adding field_with_errors to date selects, closes #3487
 2011-12-20 09:43:58 -08:00
Vasiliy Ermolovich
92088131ac fix adding field_with_errors to date selects, closes #3487 2011-12-20 20:25:56 +03:00
Alex Tambellini
fec2999e65 Fix reference to old :sql schema_format location 
After 15fb430 the default location of the :sql schema_format location was
changed from environment_name.sql to structure.sql. This pull request updates
a reference to the old schema format location in the migration guides.
 2011-12-20 22:27:33 +05:30
Hendy Tanata
e149d5059b Improve doc for ActiveRecord::Base.unscoped. 2011-12-20 22:27:32 +05:30
José Valim
51e8adba43 Depend on 3-2-stable. 2011-12-20 17:15:53 +01:00
José Valim
f29b4a02fd Add a test case for layout nil. 2011-12-20 14:56:18 +01:00
lest
e97aa2c22c remove warnings about @variable_for_layout 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-12-20 14:24:01 +01:00
José Valim
2305a98f7a Check if source is encoding aware. 2011-12-20 12:39:28 +01:00
José Valim
2e0050ce5c Do not hard code encoding to UTF8 2011-12-20 11:56:38 +01:00
Xu Pan
1897be9b50 don't encode an UTF-8 encoded template 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-12-20 11:56:33 +01:00
José Valim
5d913640bc Remove i18n dependencies from AP and AMo since they are in AS. 2011-12-20 11:56:22 +01:00
David Heinemeier Hansson
9d6e52b55e Party like its R-C-UNO! 2011-12-19 18:34:57 -06:00
David Heinemeier Hansson
1e941dde7c Add an invitation to use jbuilder, since we are not going to bundle it in 3.2 2011-12-19 18:27:19 -06:00
Piotr Sarnacki
61d0de2009 Merge pull request #4036 from Juanmcuello/database_tasks 
Fix database tasks in test namespace.
 2011-12-19 13:44:24 -08:00
Aaron Patterson
9d0789c415 adding tests for #4029 2011-12-19 13:34:54 -08:00
Juan M. Cuello
626c881863 Fix database tasks in test namespace. 
This is mostly the same as 876bade599
that was reverted due to test failures, but now with a correction.
 2011-12-19 18:20:17 -03:00
Vasiliy Ermolovich
024d3b9fcc add failing tests for issue #3487 2011-12-19 21:55:37 +03:00
José Valim
3c1884e7dd Revert "Merge pull request #4030 from Juanmcuello/database_tasks" 
This reverts commit a0edfb4d20, reversing
changes made to 4012fcff22.
 2011-12-19 19:31:36 +01:00
José Valim
a0edfb4d20 Merge pull request #4030 from Juanmcuello/database_tasks 
Fix database tasks in test namespace.
 2011-12-19 09:43:37 -08:00
Juan M. Cuello
876bade599 Fix database tasks in test namespace. 2011-12-19 13:52:27 -03:00
Jon Leighton
4012fcff22 Don't notify campfire when the build keeps passing 2011-12-18 23:37:05 +00:00
Vijay Dev
c59409b838 fix a minor typo 2011-12-19 01:31:12 +05:30
José Valim
e8d69437d4 Update activerecord/lib/active_record/railties/databases.rake 2011-12-18 20:56:59 +01:00
José Valim
81deb346af Merge pull request #4019 from kommen/rake_db_structure 
Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump
 2011-12-18 11:54:11 -08:00
Dieter Komendera
a2249eee76 Rename STRUCTURE to DB_STRUCTURE, update dump task description and add simple testcase. 2011-12-18 20:43:36 +01:00
Jon Leighton
de2306f10c Merge pull request #4014 from lest/bypass-preloading-for-ids-reader 
bypass preloading for ids_reader
 2011-12-18 09:42:15 -08:00
Jon Leighton
81c67c1441 Merge pull request #4011 from lest/scope-with-lambda-duplicates 
call scope within unscoped to prevent duplication of where values
 2011-12-18 09:35:06 -08:00
José Valim
1214e16640 Merge pull request #4018 from arunagw/warning_removed_ 
Warning removed in test
 2011-12-18 00:09:52 -08:00
Arun Agrawal
ff502d9601 Warning removed in test 2011-12-18 13:37:07 +05:30
Sergey Nartimov
109db5a550 bypass preloading for ids_reader 
when fetching ids for a collection, bypass preloading
to avoid the unnecessary performance overhead
 2011-12-18 10:59:24 +03:00
José Valim
5da792711b Merge pull request #4017 from arunagw/remove_extra_require 
No need 'abstract_unit' here. It's already in 'generators_test_helper'
 2011-12-17 23:56:25 -08:00