Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: fjc/rails
...
head fork: fjc/rails
Commits on May 19, 2011
@johnpaulashenfelter johnpaulashenfelter Closes GH #1032
Fixed what looks like minor cut/paste error in documentation for ActiveRecord::Locking:Pessimistic
3b18e90
@smartinez87 smartinez87 Remove extra white-spaces. 223f311
Commits on May 20, 2011
@plentz plentz fixes code highlight in shallow_path example 0d310d5
@guilleiguaran guilleiguaran Changing examples: use 'each' instead of 'for in' 0cb812a
@guilleiguaran guilleiguaran Replacing 'for' with 'each' in actionmailer guide 22abbb8
@guilleiguaran guilleiguaran Using each instead of for in actionview guide d037350
@guilleiguaran guilleiguaran Changin 'for' with 'each' on FormHelpers guide 93570bb
@ugisozols ugisozols Remove duplicate words. ad3e057
Commits on May 21, 2011
@smartinez87 smartinez87 Add more doc to #update_column. bf50935
@bhavinkamani bhavinkamani fix connection not established error while running rake task
db:schema:dump
e9a2ff8
@smartinez87 smartinez87 Remove extra white spaces. 0087ef9
@smartinez87 smartinez87 Remove extra white spaces on guides. 31f09a2
Commits on May 22, 2011
@mceachen mceachen Removed the `enginex` plugin reference which is broken -- rails 3.1.0…
….beta1 has that functionality now.
e368a34
@andhapp andhapp Fixed documentation for scope with path. 023ca4f
@josevalim josevalim Fix I18n dependency as final is out. 9164dda
@asanghi asanghi has_many :dependent => :restrict raises an exception but is not docum…
…ented appropriately. has_one also has :dependent => :restrict but is not documented at all.
e4f6e6a
@josh josh Lock to stable sprockets beta cdc9c3c
@josh josh Add debug_asset support 27159df
@mceachen mceachen Following proper naming conventions while referring to Rails, Bundler 330fc8c
@mceachen mceachen Merge branch 'master' of github.com:lifo/docrails 3789685
Commits on May 23, 2011
@josh josh Require sprockets beta 8 7ad24a7
@josh josh Merge branch '3-1-stable'
Conflicts:
	actionpack/actionpack.gemspec
	activemodel/activemodel.gemspec
5e519fb
@MDaubs MDaubs Minor typo describing engine helpers cb76771
@arunagw arunagw We don't need to load version any more as Sprockets.beta8 is included. 531095e
@wycats wycats Make :status an attr_reader to avoid unnecessary warning when replaci…
…ng status=
0afefa9
@wycats wycats Restructure TemplateAssertions-related code to eliminate circular req…
…uires.

Also, no need to include dependencies in AS::Concerns inside included blocks.
ddc584e
@wycats wycats Always initialize @title in caching test to avoid uninitialized insta…
…nce variable warning
7b9f3eb
@josevalim josevalim Merge pull request #1222 from arunagw/sprockets-fixes
We don't need to load version any more as Sprockets.beta8 is included.
7501943
@wycats wycats Prepare the context in URLHelperTest so that there are no required un…
…initialized instance variables
0a587ee
@wycats wycats Eliminate uninitialized instance variable warning 72c7aec
@wycats wycats Bump Rack version dd8ab4f
@tenderlove tenderlove Merge pull request #1184 from gnufied/master
Fixes connection_not established error while running db:schema:dump
7817298
@josevalim josevalim Require rubygems (chill out, just for rails internal tests). c944cab
@josevalim josevalim Move content length to the server, this brings the same behavior as i…
…n rack 1.2.
6e5eede
@fcheung fcheung Take into account time spent in AR even if a redirect occurs or if it…
… is after the render
8a722e0
@josevalim josevalim Merge pull request #1228 from fcheung/db_time_fix2
Take into account time spent in AR even if a redirect occurs or if it is after the render
a8b2a89
@smartinez87 smartinez87 Add entry to AP changelog b4951b5
@joshk joshk Removed AS core_ext/kernel/requires as it's not used and is bad pract…
…ice.
eff5d9a
@joshk joshk Removed the AS core_ext/kernel/debugger breakpoint method as this met…
…hod is added by ruby-debug and should be left as is. Missing tests added.
2514d65
@josevalim josevalim Merge pull request #1230 from smartinez87/changelog
Add entry to AP changelog
5c3f3f1
@josevalim josevalim Merge pull request #1231 from joshk/ruby-debugger
Ruby debugger corrections
a5fb1c6
@joshk joshk removed require_library_or_gem from the AS core extensions guide 09314f2
@judearasu judearasu rails request has been moved from Lighthouse to Github, contribution …
…link has been changed
c76c4f6
@Karunakar Karunakar active resource instalation instructions and Licence 424eff5
@jonleighton jonleighton Replace references to ActiveSupport::SecureRandom with just SecureRan…
…dom, and require 'securerandom' from the stdlib when active support is required.
d411c85
@jonleighton jonleighton Removed ActiveSupport::SecureRandom in favour of SecureRandom from th…
…e standard library. (It has been deprecated in the 3-1-stable branch.)
1170cce
@mceachen mceachen NOTE: doesn't handle newlines. 12ab165
@alindeman alindeman Use set data structure to speed up circular reference checks on large…
…/deeply nested objects
2213479
@tenderlove tenderlove adding AR::Fixtures::File class to wrap a fixture file ad3f0ee
@tenderlove tenderlove use top level file constant for join, etc 74c5f65
@tenderlove tenderlove return an empty array for empty yaml files 5278af3
@tenderlove tenderlove fixture file will validate fixture format 081b36c
@tenderlove tenderlove removing CSV fixture support 1716da0
@tenderlove tenderlove fixing 1.8 support for new fixture tests 5ec23b9
@smartinez87 smartinez87 Fix styling error on plugins guide. c6ec7e8
@smartinez87 smartinez87 Remove extra white spaces on ActionPack docs. fcdb5dc
@smartinez87 smartinez87 Remove extra white spaces on ActionMailer docs. 5d0d4d8
@smartinez87 smartinez87 Remove extra white spaces on ActiveModel docs. 2a4b780
@wycats wycats Start moving some logic from being embedded in AV into the Rails Spro…
…ckets extensions
4b79029
@wycats wycats Move javascript/css helpers into the Sprockets helper and just have t…
…hem override the old behavior
76f947e
@wycats wycats Move the last pockets of Sprockets stuff into the Sprockets directory a9f22dc
@smartinez87 smartinez87 Remove extra white-space on some exception messages. 05f29ca
@smartinez87 smartinez87 Remove extra white spaces on ActiveRecord docs. 0034b78
Commits on May 24, 2011
@smartinez87 smartinez87 Remove extra white spaces on ActiveSupport docs. dd6c367
@spastorino spastorino Merge pull request #1241 from smartinez87/extra-space
Remove extra white-space on exception message.
8e7590c
@wycats wycats Make sure that Sprockets::Helpers::RailsHelper can be found 9dabbd0
@smartinez87 smartinez87 Parenthesize arguments when the first one is a Regexp literal.
This fixes 'warning: ambiguous first argument; put parentheses or even spaces'.
130c9b7
@JeffCohen JeffCohen Update the MVC explanation in the main README.rdoc file 3540579
@arunagw arunagw Not loading file if PLATFORM not available. f75df05
@guilleiguaran guilleiguaran Prefer each instead of for in activeresource 647c55a
@arunagw arunagw Using java_import instead of import. Need to do this with rake 0.9.0 …
…#jruby
89da0d3
@arunagw arunagw import to java_import. ed4f2b9
@josevalim josevalim Merge pull request #1243 from smartinez87/warnings
Fix 'warning: ambiguous first argument; put parentheses or even spaces'.
a47a65f
@guilleiguaran guilleiguaran Removing extra white-spaces on config/environment/development.rb temp…
…late
e9f9bf0
@guilleiguaran guilleiguaran Removed extra white-spaces on config/environment/test.rb template 505e115
@dnagir dnagir fix minor spelling mistakes in comments 8f003de
@guilleiguaran guilleiguaran Prefer each instead of for on activesupport f4d100b
@pixeltrix pixeltrix Ignore :includes on through associations d8bd19f
@flippingbits flippingbits Add folders app and config to the engine's gemspec if they're available e3d7751
@flippingbits flippingbits Add test for gemspec of the generated engine 855d14d
@josevalim josevalim Merge pull request #1255 from flippingbits/master
Fix gemspec of full or mountable engines
72c7160
tomhuda Remaining cleanup from changes to AssetTagHelper 00be5bd
@dmathieu dmathieu properly reference yml alias nodes
as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
79dc275
@flippingbits flippingbits Remove shebang from the template since it's already added by the
generator
ab0d2f2
@josevalim josevalim Fix failing test suite (please run tests before sending pull requests…
… :S)
b8118ef
@flippingbits flippingbits Merge branch 'master' of https://github.com/rails/rails e366cd7
@dmathieu dmathieu create the dummy app if there's no test_unit but there's a dummy_path 3d9d9f8
@flippingbits flippingbits Add test for shebang in engine's script/rails file e2a0a94
@josevalim josevalim Merge pull request #1262 from dmathieu/dummy_without_tests
Create the dummy app if there's no test_unit but there's a dummy_path
cedadad
@dhh dhh Merge pull request #1257 from dmathieu/yml_alias
Properly reference yml alias nodes
dac68cb
@dhh dhh The asset pipeline is always on for new apps, dont need the legacy js…
… ext stuff
67e12eb
@josevalim josevalim Merge pull request #1267 from guilleiguaran/prefer-each-syntax
Prefer 'each' syntax instead of 'for in'
408bbdc
@ernie ernie Redundant condition in compute_asset_host is redundant. 15baa49
@josevalim josevalim Merge pull request #1268 from ernie/compute_asset_host_fix
Redundant condition in compute_asset_host is redundant.
b865576
@dhh dhh Remove asserts for js ext stuff thats not used any more dea4035
@Karunakar Karunakar changed http://api.rubyonrails.com to http://api.rubyonrails.org in r…
…eadme files
bfb9f75
@tenderlove tenderlove Merge pull request #1251 from arunagw/java_import
Using java_import instead of import. Need to do this with rake 0.9.0 #jruby
68d5abe
@tenderlove tenderlove Merge pull request #1253 from arunagw/preformance_java_import
import to java_import.
4d3c30a
@tenderlove tenderlove Merge pull request #1247 from arunagw/loading-file
Not loading file if PLATFORM not available.
ae323a5
@joshk joshk Removed deprecated ActionMailer API and related tests d500ad3
@josevalim josevalim Merge pull request #1271 from joshk/remove_am_deprecated_methods
Removed deprecated ActionMailer API and related tests
c4a9467
@JoeyButler JoeyButler Add failing test case for issue 796 e106dbf
@tenderlove tenderlove do not bother with assert_nothing_raised, the test will fail and we g…
…et a better trace without it
0df8830
@tenderlove tenderlove adding a test for create! with invalid associations 9643387
@vijaydev vijaydev fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 79e9a29
@tenderlove tenderlove add tests surrounding behavior of save and save! for associations tha…
…t have validation errors
559d809
@tenderlove tenderlove rescue record invalid exceptions and return false from the save metho…
…d. fixes #796
176883a
@josevalim josevalim Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix
Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
36991f1
@vijaydev vijaydev fixes Rake::RDocTask deprecation warnings from rake 0.9.0 b921679
@josevalim josevalim Merge pull request #1278 from vijaydev/rake-doctask-warning-fix
Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0
806d600
@josevalim josevalim Merge pull request #1239 from alindeman/master
Use set data structure to speed up circular reference checks on large/deeply nested objects
b3f51e3
@dasch dasch Use quotes consistently in Gemfile 962936c
@dasch dasch Also use double quotes for #source ef8c2a8
@josevalim josevalim Merge pull request #1279 from dasch/patch-2
Use quotes consistently in Gemfile
eff0fdf
@josevalim josevalim Merge pull request #1279 from dasch/patch-2
Use quotes consistently in Gemfile
90f59b2
@joshk joshk removed deprecated methods, and related tests, from ActionPack d182b6e
@pixeltrix pixeltrix Failing tests for #1233. f1f1ab7
@jonleighton jonleighton Ensure that the surrounding code in Relation#to_a respects the defaul…
…t_scope (as well as having Relation#arel respect the default scope). Fixes #1233.
a000ff7
@jonleighton jonleighton Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope
Ignore :includes on through associations
ce37f74
@josevalim josevalim Merge pull request #1281 from joshk/removed_action_pack_deprecations
removed deprecated methods, and related tests, from ActionPack
6f413d8
@joshk joshk corrected the ActionMailer tests which broke due to some code removed…
… from ActionPack
21317d8
@josevalim josevalim Merge pull request #1283 from joshk/actiom_mailer_tests_fixed
corrected/fixed the ActionMailer tests
4b86e7b
tomhuda Change compressor API so that plugins can register default compressor…
…s for their stylesheet or JS engines and still allow the user to turn off compression
88cb890
tomhuda Move SCSS generators and default templates from Rails to the Sass Rai…
…ltie (d435726312601edb3ba6f97b34f562221f72c1f8).

* Sass gem registers a compressor
* Sass gem registers generators for assets and scaffold
* Create a default stylesheet_engine ("css") for apps that remove the Sass gem
74ade51
@wycats wycats Update generator config to support hiding namespaces and pass the app…
… into generator blocks
c1df442
@wycats wycats Hide css:* and the default stylesheet from rails g d21fef3
@jonleighton jonleighton Fix infinite recursion where a lazy default scope references a scope.…
… Fixes #1264.
c69111b
@wycats wycats Update default Gemfile to point to sass-rails, not sass d1d34ce
@josevalim josevalim Streamline generators initialization flow. 594b749
@josevalim josevalim Actually this file may be invoked directly as well with --dev. 76cebf2
@josevalim josevalim Everyone receives app as argument for consistency. 52e01fc
Commits on May 25, 2011
@joshk joshk removed deprecated methods, and related tests, from ActiveRecord 542114e
@arunagw arunagw Fixed failing tests for generators_test 8e55d3e
@arunagw arunagw fixed test_deliver_is_notified need base_mailer c302670
@tenderlove tenderlove Merge pull request #1286 from arunagw/fixed_failing_generators_test
Fixed failing tests for generators_test
c29ce8a
@guilleiguaran guilleiguaran load_generators_from_railties was removed, remove failing test_load_g…
…enerators_from_railties
ce4afa2
@guilleiguaran guilleiguaran Removing deprecated config.paths.app.controller API 685a919
@guilleiguaran guilleiguaran Removing Deprecated Path API tests ce350de
@guilleiguaran guilleiguaran Remove deprecated plugin generator 6e1dbb8
@guilleiguaran guilleiguaran Removing deprecated config.generators in Rails::Railtie 944aee7
@TheEmpty TheEmpty Adds outline draft#1 for the Asset Pipeline, please comment if you ha…
…ve thoughts about it!
99dd117
@josevalim josevalim Merge pull request #1287 from guilleiguaran/removing-test_load_genera…
…tors_from_railties

load_generators_from_railties was removed, remove test with error about it
a5ee94f
@josevalim josevalim Merge pull request #1288 from guilleiguaran/railties-deprecations
Remove Railties deprecated methods
3b2ee3b
@vijaydev vijaydev update language env variable name 31bb347
@josevalim josevalim Use load_generators instead. 460ce7d
@arunagw arunagw Using load_generators d9204c1
@josevalim josevalim Merge pull request #1290 from arunagw/load_generators_use
Using load_generators
144d1b8
@arunagw arunagw Database.rake file fixed for load_generators 5d89675
@janx janx fix Rails::Paths::Root document a984050
@josevalim josevalim Merge pull request #1292 from arunagw/database_generators
Database.rake file fixed for load_generators
9562c0f
@josevalim josevalim Merge pull request #1293 from janx/master
Fix Rails::Paths::Root documentation
b1bb9d1
@franckverrot franckverrot Test AR::Base#inspect on an allocated object not yet initialized bf159aa
@franckverrot franckverrot Fix the AR::Base#inspect method [closes #1294] b2db874
@josevalim josevalim Merge pull request #1297 from cesario/1294-allocated-object-cant-be-i…
…nspected


#1294 : allocated object cant be inspected [closes #1294]
b145a72
@JeffCohen JeffCohen Replace old wording about http requests 727a5a7
@josevalim josevalim Merge pull request #1260 from flippingbits/master
Remove shebang from the template
41eac9b
@flippingbits flippingbits Add test files to engine's gemspec 5cf934e
@flippingbits flippingbits Remove whitespaces from empty line 360b98f
@flippingbits flippingbits Improve test assertion 22be5ca
@josevalim josevalim Merge pull request #1298 from flippingbits/add_test_files_to_gemspec
Add test files to engine's gemspec
903f1f9
@franckverrot franckverrot Add the MIT-LICENSE to the Active Record gemspec 64d9773
@franckverrot franckverrot Add the MIT-LICENSE to the Active Resource gemspec 85283f0
@franckverrot franckverrot Add the MIT-LICENSE to the Active Support gemspec 4633772
@josevalim josevalim Merge pull request #1299 from cesario/mit-license
Ensure MIT-LICENSE is included in all the gemspec's
f116a48
@amatsuda amatsuda require 'rake/rdoctask' if failed to require 'rdoc/task'
fixes a regression introduced by b921679
require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
24b28a2
@fxn fxn Merge pull request #1301 from amatsuda/require_rdoc_task_fail
require 'rake/rdoctask' if failed to require 'rdoc/task'
ee46bb7
@amatsuda amatsuda Ensure RDoc::Task exists even if 'rdoc/task' was not required 05adf52
@vijaydev vijaydev fix incorrect textile syntax 542cee3
@vijaydev vijaydev changes validates_presence_of to newer syntax 45989b8
@vijaydev vijaydev changes validates_uniqueness_of to newer syntax deffc9d
@vijaydev vijaydev changes validates_acceptance_of to newer syntax 084750c
@vijaydev vijaydev changes validates_confirmation_of to newer syntax cc10dff
@vijaydev vijaydev changes validates_length_of to newer syntax 34a05a7
@vijaydev vijaydev changes validates_inclusion & exclusion to newer syntax f69d5cd
@vijaydev vijaydev changes validates_format & numericality to newer syntax 492f606
@vijaydev vijaydev fix indentation 548e5ba
@wycats wycats Renaming helper in the Rake task, but why is this needed in the first…
… place? (paging JP)
e144b3e
@vijaydev vijaydev fixed minor errors ffaefe2
@vijaydev vijaydev prefer validates :x in place of validates_x_of 2c29c40
@leereilly leereilly Typo; changed 'enviroment' to 'environment' 29ff12b
@leereilly leereilly Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed' 1d637d2
@leereilly leereilly Typo; changed 'Febuary' to 'February' 03f4183
@josevalim josevalim Merge pull request #1308 from vijaydev/fix-codestat-indent
Minor indentation fix in code_statistics
89d06ea
@josevalim josevalim Merge pull request #1305 from amatsuda/require_rdoc_task_fail2
Ensure RDoc::Task exists even if 'rdoc/task' was not required
d25b7c2
@tenderlove tenderlove Merge pull request #1285 from joshk/remove_active_record_deprecations
removed deprecated methods, and related tests, from ActiveRecord
6b436c2
@fxn fxn Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
00e1d08
@fxn fxn Merge branch 'master' of github.com:rails/rails b7921f5
@kuldarkrabbi kuldarkrabbi action_view/template/handler has been removed 9a68333
@josevalim josevalim Merge pull request #1311 from kuldarkrabbi/master
action_view/template/handler.rb has been removed
7fd0a6d
@joshk joshk Removed deprecated methods and related tests from ActiveSupport 9cafc28
@josevalim josevalim Merge pull request #1312 from joshk/remove_active_support_deprecations
Removed deprecated methods and related tests from ActiveSupport
9b67918