Commit Graph

25618 Commits

Author SHA1 Message Date
Martin Svalin
c9ca86c29d New #added? method on ActiveModel::Errors
The #added? method makes it possible to check if a specific error has been added, using the same parameters as for #add.
2011-10-19 21:29:20 +02:00
Vijay Dev
89a164ab9b Merge pull request #3362 from avakhov/p-superfluous-assign-cookies
Remove superfluous assignment in cookies
2011-10-19 00:28:33 -07:00
Aaron Patterson
c2f3c9bf56 only use now() on pg! 2011-10-18 13:30:01 -07:00
Alexey Vakhov
bed5825f77 Remove superfluous assignment in cookies 2011-10-18 22:57:55 +04:00
Aaron Patterson
6a28c512e3 reset prepared statement when schema changes imapact statement results. fixes #3335 2011-10-18 11:20:13 -07:00
Santiago Pastorino
d44702c830 Use again Rack's ContentLength middleware part 2 2011-10-18 16:14:38 -02:00
Santiago Pastorino
7f184aaf43 Use again Rack's ContentLength middleware 2011-10-18 16:04:15 -02:00
José Valim
71325bb308 Merge pull request #3350 from whilefalse/rake_environment_in_engines
Added environment rake task to engines
2011-10-18 10:09:13 -07:00
Aaron Patterson
76af2818a6 use now() for dates in pg 2011-10-18 10:07:40 -07:00
steve
40d1555091 Added test for rake environment in an engine 2011-10-18 17:11:50 +01:00
Steven Anderson
c547e968f5 Added environment rake task to engines 2011-10-18 15:46:39 +01:00
José Valim
5e1b912f3b Merge pull request #3356 from arunagw/bunp_rack
Bump Rack to 1.3.5
2011-10-17 23:04:24 -07:00
Arun Agrawal
124bb17638 Bump Rack to 1.3.5 2011-10-18 11:09:59 +05:30
José Valim
7511f9794d Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_check
Exclude _destroy parameter in :all_blank check (issue #2937)
2011-10-17 11:15:58 -07:00
Aaron Christy
8510a0bb5a Exclude _destroy parameter in :all_blank check (issue #2937) 2011-10-17 13:29:11 -04:00
José Valim
59d6df5c69 Merge pull request #3151 from zenprogrammer/pluralize_without_count
Added include_count parameter to pluralize.
2011-10-17 07:02:39 -07:00
Vijay Dev
8dffc62a9b use variables from test setup 2011-10-17 19:15:24 +05:30
Vijay Dev
826a850696 fix a typo and slightly reword has_secure_password comment 2011-10-17 19:14:29 +05:30
José Valim
2f87b724d2 Merge pull request #3319 from martinsvalin/active_model_errors_fixes
ActiveModel::Errors#generate_message without i18n_scope, and more test cases for #add
2011-10-17 00:34:35 -07:00
Martin Svalin
180d4137ca ActiveModel::Errors#generate_message without i18n_scope, and more test cases for #add 2011-10-17 09:22:08 +02:00
Aaron Patterson
8919a68b96 Merge pull request #3334 from mperham/master
Default timestamps to non-null
2011-10-16 16:14:56 -07:00
Vijay Dev
f10d62c4bf Merge pull request #3343 from vatrai/fix_warning
fix to remove warning in test cases
2011-10-16 07:43:54 -07:00
Vishnu Atrai
9210458547 fix to remove warning in test cases 2011-10-16 14:29:06 +05:30
José Valim
098c95abcb Merge pull request #3320 from sunaku/space-align
fix inconsistent alignment in Gemfile generator
2011-10-15 01:56:30 -07:00
Mike Perham
3dbedd2823 Default timestamps to non-null 2011-10-14 21:09:53 -07:00
Vijay Dev
e759c8882a Merge branch 'master' of github.com:lifo/docrails 2011-10-14 22:21:40 +05:30
José Valim
521a089166 Merge pull request #3331 from fabrik42/master
Include affected record when raising an ActiveRecord::StaleObjectError
2011-10-14 09:42:03 -07:00
Christian Bäuerlein
c6f0461e89 Consider attempted action in exception message of ActiveRecord::StaleObjectError 2011-10-14 18:20:41 +02:00
Christian Bäuerlein
410fa4cf7c Includes stale record in StaleObjectError 2011-10-14 16:28:02 +02:00
Vijay Dev
e2a3952428 Merge pull request #72 from pote/master
small fix
2011-10-14 03:08:08 -07:00
Ryan Bigg
6df79bf580 [engines guide] WIP for explaining how to hook engine into application 2011-10-14 18:44:39 +11:00
Ryan Bigg
aae77d2839 [engines guide] complete comments resource generation 2011-10-14 18:44:39 +11:00
Ryan Bigg
3d192c7385 [engines guide] Add heading for comments 2011-10-14 18:44:39 +11:00
Ryan Bigg
2c8b8ce9ee [engines guide] make clear that the comment generator command is just one line 2011-10-14 18:44:39 +11:00
Ryan Bigg
2101bc9fd0 [engines guide] make it clear that the scaffold generator output isn't part of the actual command 2011-10-14 18:44:39 +11:00
Ryan Bigg
690dd2f64c [engines guide] correct render line is blorgh/comments/form 2011-10-14 18:44:39 +11:00
Ryan Bigg
411613ab20 [engines guide] improve wording for sentence describing comments/form partial 2011-10-14 18:44:38 +11:00
Jeremy Kemper
401d00d296 Symbol captures may generate multiple path segments, so don't escape / -> %2F. Test splat escaping. 2011-10-13 21:42:15 -07:00
Jeremy Kemper
bceec4c3c3 / is allowed in URI fragments 2011-10-13 21:41:30 -07:00
Jeremy Kemper
ec37160664 Leave escaping up to Journey 2011-10-13 21:40:42 -07:00
Jeremy Kemper
45ced7e1be Failing tests for path parameter escaping 2011-10-13 19:02:58 -07:00
PoTe
dadfa1e34f security reasonS should be plural 2011-10-13 22:31:32 -02:00
Santiago Pastorino
a5b0f914f1 Merge pull request #3314 from macmartine/master
Remove user-specified delimiter from start when no area code is present (in number_to_phone)
2011-10-13 16:26:55 -07:00
Jeremy Kemper
8cbe826958 Rails 4 is just around the corner. Stuck with 1.8 until then. 2011-10-13 16:11:00 -07:00
Jeremy Kemper
0a9b6de4d2 Tests gotta run in 1.8 too 2011-10-13 15:54:53 -07:00
Santiago Pastorino
df5ea6b8b1 Merge pull request #2224 from kommen/fix_fragment_caching_for_master
Fix fragment cache helper regression on cache miss introduced with 03d01e
2011-10-13 15:48:49 -07:00
Suraj N. Kurapati
d32a90b9b7 fix inconsistent alignment in Gemfile generator 2011-10-13 15:36:50 -07:00
David Heinemeier Hansson
85b64f98d1 Added ActiveRecord::Base.store for declaring simple single-column key/value stores [DHH] 2011-10-13 16:24:22 -05:00
Santiago Pastorino
8f11d53506 Merge pull request #2219 from kommen/fix_fragment_caching_squashed
Fix fragment caching (squashed commits)
2011-10-13 13:36:20 -07:00
Diego Carrion
b7cccae71e improved ActiveResource's .element_path and .new_element_path methods documentation by specifing how .site should be declared in order to use prefix_options 2011-10-13 16:27:10 -03:00