Commit Graph

24259 Commits

Author SHA1 Message Date
Arun Agrawal
4fe2c99052 Test add for plugin new generator generate mailer 2011-07-29 22:06:36 +05:30
José Valim
270fa63e9b Merge pull request #2339 from dgeb/mailers-in-plugins
Ensure that app/mailers gets created in new plugins (#2287 brought into master)
2011-07-29 07:21:16 -07:00
Dan Gebhardt
d8e62a93e3 Include empty app/mailers directory in mountable and full plugins 2011-07-29 08:15:44 -04:00
Santiago Pastorino
54463592cb Tidy up 2011-07-28 16:56:57 -03:00
José Valim
caacf85673 Merge pull request #2327 from cesario/patch-1
We don't need to require erb here.
2011-07-28 11:24:08 -07:00
José Valim
b295ea1362 Merge pull request #2330 from thedarkone/resources-router-fix
Inline resources router fix
2011-07-28 11:10:23 -07:00
thedarkone
a5f57a7ef2 Make use of the inherited initializer. 2011-07-28 20:02:21 +02:00
thedarkone
4d4d2179f6 There is no need to be destructive with the passed-in options.
This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
2011-07-28 20:00:48 +02:00
Xavier Noria
adce9b4ca3 Merge pull request #2329 from nertzy/master
Give attribution to Peter Jaros for the patch we paired on
2011-07-28 10:12:51 -07:00
Grant Hutchins
b407034c9d Give attribution to Peter Jaros for the patch we paired on. 2011-07-28 13:38:28 -03:00
Santiago Pastorino
84763047a0 Merge pull request #2326 from castlerock/plugin_generator_fix
pluging generator test fix
2011-07-28 08:47:04 -07:00
Franck Verrot
ad0772f268 We don't need to require erb here. 2011-07-28 18:45:43 +03:00
Vishnu Atrai
5a4e8f5514 pluging generator test fix 2011-07-28 21:14:29 +05:30
Santiago Pastorino
d10f268d20 Tidy up a bit plugin new gemspec 2011-07-28 11:48:21 -03:00
Santiago Pastorino
5ab9132c19 Merge pull request #2295 from dgeb/mo-better-plugins
Improve dependency management and gemspec file for plugins
2011-07-28 07:44:10 -07:00
Dan Gebhardt
a74e4736f9 Moved dependencies from Gemfile to gemspec to eliminate redundant declarations. 2011-07-28 09:58:27 -04:00
Dan Gebhardt
d9b59c341c Extracted version from gemspec and placed it in its own file. This is consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems. 2011-07-28 09:47:21 -04:00
Dan Gebhardt
5515a18aa5 Expanded meta-data in gemspec to include author, email, etc.; Defaults include "TODO" to prevent gems from being built without review. 2011-07-28 09:46:13 -04:00
Jon Leighton
971a74b81f Revert "Merge pull request #2309 from smasry/master"
This reverts commit 9d396ee819, reversing
changes made to fa2bfd832c.

Reason: the change broke the build.
2011-07-28 13:14:11 +01:00
José Valim
30dae273c8 Update CHANGELOG. 2011-07-28 10:05:17 +02:00
José Valim
d5eeacc95f Move the cache to a nested hash which performs better than a hash with array as keys. 2011-07-28 10:01:55 +02:00
José Valim
dee8115539 Rename class method to_path to _to_path and make it explicit that it is an internal method. 2011-07-28 09:56:42 +02:00
José Valim
1b7db58a06 Merge pull request #2034 from Casecommons/to_path
Allow ActiveModel-compatible instances to define their own partial paths
2011-07-28 00:50:07 -07:00
Joshua Peek
8248052ee7 Make Rails.application.assets available in initializers 2011-07-27 15:29:36 -05:00
Xavier Noria
5eeae68657 contrib app minor tweak 2011-07-27 13:25:08 -07:00
Aaron Patterson
9d396ee819 Merge pull request #2309 from smasry/master
Unmangaling reverse_sql_order when function is used
2011-07-27 10:26:39 -07:00
Samer Masry
18d307ed94 Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 2011-07-27 10:17:25 -07:00
Santiago Pastorino
fa2bfd832c Merge pull request #2305 from thedarkone/errors-include
Improve AM::Errors#include?
2011-07-27 09:44:15 -07:00
thedarkone
efe4cbe5f2 Handle the empty array correctly. 2011-07-27 18:07:47 +02:00
Christos Zisopoulos
8faeed1d71 Improve performance and memory usage for options_for_select with Ruby 1.8.7 2011-07-27 08:37:10 -07:00
Jon Leighton
091e767c2d Merge pull request #1969 from dmitriy-kiriyenko/calculations_with_having_on_select
ActiveRecord calculation fail when having contains conditions based on select values
2011-07-27 07:02:04 -07:00
Dmitriy Kiriyenko
9a298a162c Fixed failing query when performing calculation with having based on select. 2011-07-27 16:48:15 +03:00
Jon Leighton
24f0a872e6 Add a proxy_association method to association proxies, which can be called by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. 2011-07-27 12:36:00 +01:00
Xavier Noria
46b8261830 Merge pull request #2296 from lsylvester/typo
fix some typos
2011-07-27 01:11:31 -07:00
Lachlan Sylvester
7e13284645 fix some types in schema_test.rb 2011-07-27 17:01:50 +10:00
Aaron Patterson
0b987042bf simplify conditionals by assuming hash values will never be false 2011-07-26 17:49:47 -07:00
Aaron Patterson
7868cf8a65 use regular ruby rather than clever ruby 2011-07-26 17:45:34 -07:00
Aaron Patterson
ba43b9bf5f fixing wildcard path matching when wildcard is inside parenthesis 2011-07-26 17:33:22 -07:00
Aaron Patterson
e4a7b23d38 Merge pull request #2291 from jdelStrother/load_missing_constant
Replace unnecessary regexp in Dependencies#load_missing_constant
2011-07-26 16:19:48 -07:00
Jonathan del Strother
43ef635b95 Replace unnecessary regexp in Dependencies#load_missing_constant 2011-07-27 00:06:19 +01:00
Santiago Pastorino
6089ecf931 Merge pull request #2279 from jdelStrother/load_missing_constant
Constantize a regexp in Dependencies#load_missing_constant
2011-07-26 15:23:11 -07:00
Santiago Pastorino
b4efff4bac Remove blank line 2011-07-26 19:20:45 -03:00
Santiago Pastorino
77e67f419c Merge pull request #2273 from thoefer/refactor
refactored 'assert_redirected_to'
2011-07-26 15:18:39 -07:00
Santiago Pastorino
17d0efb679 Remove cruise files 2011-07-26 18:11:03 -03:00
Aaron Patterson
ef89a70540 Merge pull request #2095 from dgeb/issue-2094
Fixes overriding of options[:html][:remote] in form_for() (Issue #2094)
2011-07-26 13:50:20 -07:00
Santiago Pastorino
d482cf8bfa Merge pull request #2285 from castlerock/remove_warnings_ruby193
remove unused variables warnings removed
2011-07-26 12:33:34 -07:00
Santiago Pastorino
49ebd01d19 Merge pull request #2284 from joshk/patch-6
enable Travis CI irc notifications to #rails-contrib on irc.freenode.org
2011-07-26 12:32:39 -07:00
Vishnu Atrai
db34a65277 remove unused variables warnings removed 2011-07-26 23:53:54 +05:30
Josh Kalderimis
5a5d7ba973 enable Travis CI irc notifications to #rails-contrib on irc.freenode.org 2011-07-26 18:17:58 +00:00
Aaron Patterson
0868461ee0 Merge pull request #2283 from castlerock/remove_warnings_ruby193
remove deprication warning: ambiguous first argument; put parentheses or
2011-07-26 11:14:23 -07:00