Rafael Mendonça França
da5a47e7b9
Update the guides and CHANGELOG
2012-03-17 13:44:56 -03:00
Rafael Mendonça França
919afca238
Whitespaces ✂️
2012-03-17 13:36:35 -03:00
Rafael Mendonça França
041f4eec39
Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x
2012-03-17 13:36:35 -03:00
Rafael Mendonça França
9ec63eb049
Rack::SSL -> ActionDispatch::SSL
2012-03-17 13:36:35 -03:00
Vijay Dev
6ce54d4ba8
Merge branch 'master' of github.com:lifo/docrails
2012-03-17 21:15:36 +05:30
Santiago Pastorino
f987220756
Add missing require
2012-03-17 12:43:04 -03:00
Santiago Pastorino
d266c2e0da
Remove unused require
2012-03-17 12:43:04 -03:00
Xavier Noria
6d87cd028b
moves the guides up to the root directory
2012-03-17 08:32:49 -07:00
Jonathan R. Wallace
9e09e8f526
Updates 'modyfing' typo to 'modifying'
2012-03-17 11:23:39 -04:00
Vijay Dev
9d06b49913
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
railties/guides/source/getting_started.textile
2012-03-17 20:30:08 +05:30
José Valim
39514af7e7
Merge pull request #5480 from drogus/rendering-issues
...
Fix for #5440
2012-03-17 11:24:19 -03:00
José Valim
4711298767
Merge pull request #5321 from pfeiffer/uniqueness_validator_conditions
...
Add :conditions option to uniqueness validator
2012-03-17 07:13:58 -07:00
José Valim
21e5300089
Merge pull request #5487 from kennyj/should_use_argument
...
Should use an argument in http_digest_authentication_test.rb
2012-03-17 05:13:37 -07:00
kennyj
131083b819
Should use an argument in http_digest_authentication_test.rb
2012-03-17 20:23:28 +09:00
José Valim
cb0585eabe
Merge pull request #5470 from sandeepravi/warning_fixes
...
fixed - warning: instance variable @controller not initialized
2012-03-17 00:18:39 -07:00
José Valim
ab9f1b6f23
Merge pull request #5483 from luke-gru/gemfile_change
...
switch rack-test in Gemfile to using git protocol
2012-03-17 00:17:31 -07:00
Egor Homakov
bf94f1cab7
using pluck
2012-03-17 07:05:38 +01:00
kennyj
0360b3eb1f
Fix GH #5435 . db:structure:dump should be reenable.
2012-03-17 13:57:10 +09:00
Xavier Noria
92563722da
Merge pull request #5484 from luke-gru/consistent_module_naming
...
use consistent explicit module inclusion
2012-03-16 19:02:02 -07:00
Luke Gruber
08c4d8eac3
use consistent explicit module inclusion
...
aid ease of understanding and readability for tests
2012-03-16 21:54:25 -04:00
Luke Gruber
d80fcc9949
switch rack-test in Gemfile to using git protocol
...
can't run tests if git not compiled with libcurl
2012-03-16 21:48:25 -04:00
Piotr Sarnacki
facf1e54f1
Merge pull request #5475 from rafaelfranca/fix-build
...
Fix ActiveRecord::Relation#blank? tests
2012-03-16 13:34:11 -07:00
Rafael Mendonça França
404d785d29
Fix ActiveRecord::Relation#blank? tests
2012-03-16 17:05:35 -03:00
Mike Mulvaney
f820098f9e
Moved squawk method into LocalInstanceMethods module, so it would
...
not be added to every ActiveRecord::Base object. Changed acts_as_yaffle
so it will include the LocalInstanceMethods module. Now only
models that call acts_as_yaffle will get the squawk method, instead
of pushing them into every ActiveRecord::Base.
2012-03-16 15:53:16 -04:00
Mike Mulvaney
2dd486ceb5
Changed unit tests so they refer to yaffle_test_field as symbol.
...
acts_as_yaffle expects a symbol, so the string was causing the tests
to always fail.
2012-03-16 15:50:53 -04:00
Aaron Patterson
090156adeb
use empty? on the hash to avoid another method call
2012-03-16 12:15:31 -07:00
Aaron Patterson
4c8a5a0087
removed unnecessary calls to "freeze"
2012-03-16 11:50:15 -07:00
Aaron Patterson
273054d6e1
remove some mocha stubs
2012-03-16 11:24:52 -07:00
Aaron Patterson
0ae5807fa3
make stubbing Time.now easier
2012-03-16 10:36:18 -07:00
Mark Larimer
9dba310b1e
Revert "Fix typo in AR Callbacks."
...
This reverts commit 55df1df937f096bbdae29f8af965f204f08943b8.
2012-03-16 11:54:44 -05:00
José Valim
8d87d5c947
Merge pull request #5469 from yakko/master
...
tests for Relation .present? .blank?
2012-03-16 07:37:13 -07:00
Thiago Almeida
964ed6e802
test relation presence fix
2012-03-16 11:30:24 -03:00
Sandeep
5ae53d5cde
fixed - warning: instance variable @controller not initialized
2012-03-16 19:42:00 +05:30
Thiago Almeida
4498f93e68
tests for Relation .present? and .blank? are check cases and shouldn't force sql-count
2012-03-16 11:04:24 -03:00
Santiago Pastorino
5245eb30b1
Merge pull request #5468 from sandeepravi/warning_fixes
...
fixed - warning: ambiguous first argument; put parentheses or even spaces
2012-03-16 06:48:00 -07:00
Sandeep
e7f8d50695
fixed - warning: ambiguous first argument; put parentheses or even spaces
2012-03-16 19:07:41 +05:30
José Valim
034ccf4048
Speed up mass assignment by avoiding extra loops.
2012-03-16 13:40:42 +01:00
José Valim
6d0047aff8
Merge pull request #5467 from bogdan/initialize_callbacks
...
ActiveRecord::Core#initialize: improve performance
2012-03-16 05:34:16 -07:00
José Valim
f5b9dd3173
Merge pull request #5466 from carlosantoniodasilva/as-review
...
Remove deprecation from AS::Deprecation behavior, some minor cleanups
2012-03-16 05:14:47 -07:00
Carlos Antonio da Silva
c045eebd5d
Remove deprecation from AS::Deprecation behavior, some minor cleanups
...
* Refactor log subscriber, use select! to avoid a new object
* Remove deprecation messages related to AS::Deprecation behavior
This was added about 2 years ago for Rails 3:
d4c7d3fd94
* Remove some not used requires
* Refactor delegate to avoid string conversions and if statements inside each block
2012-03-16 09:01:48 -03:00
José Valim
2afe12f05c
Merge pull request #5465 from sandeepravi/warning_fixes
...
fixed - warning: assigned but unused variable - checker
2012-03-16 04:54:54 -07:00
Sandeep
15404fd3da
fixed - warning: assigned but unused variable - checker
2012-03-16 17:14:54 +05:30
Piotr Sarnacki
fc6b961b09
Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs
...
Fix exceptions messages in AC layouts
2012-03-16 03:25:09 -07:00
José Valim
fa7a3aaac7
Merge pull request #5461 from yakko/master
...
relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)
2012-03-16 00:22:19 -07:00
Thiago Almeida
9d52b45a5b
relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)
2012-03-16 01:14:24 -03:00
Aaron Patterson
e61e0c0b03
Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_column
...
Don't reset inheritance_column when setting explicitly.
2012-03-15 18:31:20 -07:00
Piotr Sarnacki
e2b6751312
Merge pull request #5454 from luke-gru/luke-dev
...
allow zero-arity proc for AbstrController::layout
2012-03-15 16:07:06 -07:00
Aaron Patterson
b9c21aa95b
Merge pull request #5457 from brianmario/typo-fix
...
Fix typo in redirect test
2012-03-15 15:22:13 -07:00
Brian Lopez
6ce21af8aa
fix typo in redirect test
2012-03-15 15:15:10 -07:00
Aaron Patterson
a7dee1aeef
Merge pull request #5456 from brianmario/redirect-sanitization
...
Strip null bytes from Location header
2012-03-15 14:56:50 -07:00