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
24,246 Commits 34 Branches 105 Tags
d10f268d2057a4e9d46bd003afeceb4e910d1153
Commit Graph

24246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vishnu Atrai
1e69f0b84a remove deprication warning: ambiguous first argument; put parentheses or even spaces 2011-07-26 23:39:17 +05:30
Aaron Patterson
64807b964f fixing tests on ruby trunk 2011-07-26 11:02:41 -07:00
Aaron Patterson
d4246e5bb3 fixing whitespace errors 2011-07-26 11:00:33 -07:00
Santiago Pastorino
af6abc6404 Merge pull request #2281 from castlerock/remove_warnings_ruby193 
remove deprication warning for ruby 1.9.3-head for unused variable
 2011-07-26 10:42:15 -07:00
Vishnu Atrai
cf3f1c9ba8 remove deprication warning for ruby 1.9.3-head for unused variables 2011-07-26 22:33:23 +05:30
Jonathan del Strother
f17ea60f98 Constantize a regexp in Dependencies#load_missing_constant 2011-07-26 16:10:55 +01:00
José Valim
bdbf97c23b Merge pull request #2277 from dmathieu/fix_actionpack_tests 
Fix actionpack's test suite
 2011-07-26 08:02:45 -07:00
Damien Mathieu
945f0c82af use sprocket's append_path and assert_match 2011-07-26 16:59:15 +02:00
Piotr Sarnacki
14c6fca9cd Revert "allow select to have multiple arguments" 
This reverts commit 04cc446d17.

I reverted it because apparently we want to use: select([:a, :b])
instead of select(:a, :b), but there was no tests for that form.
 2011-07-26 16:15:12 +02:00
Piotr Sarnacki
89f3d8a886 Merge pull request #2271 from slawosz/enhance_select_method_api 
allow select to have multiple arguments ie. Post.select(:id,:name,:author)
 2011-07-26 06:33:54 -07:00
Santiago Pastorino
cfd086a302 Merge pull request #2272 from cesario/fix_relations_test 
Simplify the test by using id and name.
 2011-07-26 06:25:05 -07:00
Sławosz Sławiński
04cc446d17 allow select to have multiple arguments 2011-07-26 14:57:47 +02:00
thoefer
3bfcf5ffc8 refactored 'assert_redirected_to': local call to validate_request! will be called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier. 2011-07-26 11:42:53 +02:00