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
22,988 Commits 34 Branches 105 Tags
0fab87f824dcd4bb3e2a9afa4e4bea703e5db761
Commit Graph

22988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Sprenger
0fab87f824 Prepend bundle exec to get the correct Rake version 2011-06-10 13:02:33 +01:00
Brian Quinn
2d4d7ccf33 Ensure engine migrations are copied in the same sequence that they are required. 2011-06-10 12:59:41 +01:00
Andrew White
21a8dc7a79 Ensure number helpers can handle HTML safe strings - closes #1597. 2011-06-10 11:21:16 +01:00
Aaron Patterson
279781f896 bumping to 3.1.0.rc4 2011-06-09 15:53:49 -07:00
Aaron Patterson
58ac641d3e ensuring that json_escape returns html safe strings when passed an html safe string 2011-06-09 15:29:30 -07:00
Damien Mathieu
dc73c2c38f don't reinitialize the arel_table unless the table_name changes 2011-06-09 14:40:26 -07:00
Jacob Poulsgaard Tjoernholm
7cca6a2640 Fix issue #1598 by adding a dependency to the RDoc gem. 2011-06-09 14:38:13 -07:00
Aaron Patterson
9e71825d5f Merge pull request #1610 from sikachu/3-1-stable-javascript 
Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
 2011-06-09 11:39:09 -07:00
Prem Sichanugrist
66dbef6d79 Make sure escape_javascript return SafeBuffer if the incoming argument is already html_safe 2011-06-09 14:28:21 -04:00
David Heinemeier Hansson
fa6b12aeed Indention style + whitespace for readability 2011-06-09 01:29:25 +02:00
David Heinemeier Hansson
da8ba393bd If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on 2011-06-09 01:28:56 +02:00
Aaron Patterson
aefd703443 bumping to 3.1.0.rc3 2011-06-08 14:34:20 -07:00
Marian Rudzynski
31023da1b6 use association_primary_key in AssociationScope#add_constraints 
(cherry picked from commit 1f7c3d0264)
 2011-06-08 22:03:51 +01:00
Aaron Patterson
5c498faeff Merge pull request #1566 from sikachu/3-1-stable-changelog 
Update CHANGELOG to mention the new SafeBuffer change
 2011-06-08 09:21:39 -07:00
Bhavin Kamani
696a94baa9 fix connection not established error while running rake task 
db:schema:dump
(cherry picked from commit e9a2ff8bb7)
 2011-06-08 17:12:23 +01:00
Prem Sichanugrist
d2b0605a3f Update CHANGELOG to mention the new SafeBuffer change 2011-06-08 11:59:01 -04:00
José Valim
a40833cad6 Merge pull request #1562 from sikachu/3-1-i18n-convention 
Brought back alternative convention for namespaced models in i18n.
 2011-06-08 08:14:03 -07:00
thoefer
3451bcb62e Brought back alternative convention for namespaced models in i18n. 2011-06-08 11:10:56 -04:00
José Valim
abc029d64e Merge pull request #1561 from sikachu/3-1-escapejs 
Make escape_javascript happy to handle SafeBuffers
 2011-06-08 08:10:24 -07:00
Paul Gallagher
4663893726 Make escape_javascript happy to handle SafeBuffers 
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
 2011-06-08 11:06:58 -04:00
José Valim
caa0b1d816 Merge pull request #1557 from guilleiguaran/multiple-sources-sprockets-3-1 
Multiple sources in sprockets helpers (backported from master)
 2011-06-08 06:26:18 -07:00
Guillermo Iguaran
6e9714ca1e Allow multiple sources in Sprockets helpers 2011-06-08 08:13:50 -05:00
Raimonds Simanovskis
64a5865b05 Do not hardcode :id as it was ignored by mass assignment filter 
As a result test was failing on Oracle where ids are assigned by default from 1000
 2011-06-08 11:18:06 +02:00
José Valim
623c16f4f8 Merge pull request #1546 from sikachu/31safebuffer 
Fix failing ActionPack tests on 3-1-stable
 2011-06-07 23:19:45 -07:00
Prem Sichanugrist
719e05da06 Add proper fix to mail_to helper. 
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
* Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
 2011-06-08 01:51:48 -04:00
Prem Sichanugrist
d1a74755b3 Adapt [823aa223ef] to make sure we perform cloning before manipulation only on OutputBuffer. 
After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223ef] does not play nice with the String, and result in the fragment got lost.
 2011-06-08 01:07:39 -04:00
Prem Sichanugrist
509aa66360 Fix simple_format helper to work correctly with the new SafeBuffer rule. 
This has been ported from `3-0-stable` [ed3796434a]
 2011-06-08 00:25:56 -04:00
Christopher Meiklejohn
eb85169b9a Fragment caching needs to operate on the pure output, not the 
safebuffer.
 2011-06-08 00:24:18 -04:00
Aaron Patterson
26648978b6 bumping to rails 3.1.0.rc2 2011-06-07 17:01:20 -07:00
Michael Koziarski
a06fec6dc0 Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe? 
Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.

Conflicts:

	activesupport/test/safe_buffer_test.rb
 2011-06-07 17:01:20 -07:00
Jon Leighton
e1498611d5 When you add a record to a polymorphic has_one, you should be able to access the owner from the associated record 2011-06-08 00:33:18 +01:00
Jon Leighton
f5f020be43 Allow polymorphic has_one to work when the association is set before the owner has been saved. Fixes #1524. 2011-06-08 00:33:18 +01:00
Vijay Dev
b7ea35d588 fix spacing 
Conflicts:

	railties/guides/source/configuring.textile
 2011-06-08 00:27:37 +02:00
Vijay Dev
f8f00cc96c add missing generator configs 2011-06-08 00:25:15 +02:00
Vijay Dev
2cbd02449d proof reading and fixes in configuring guide 2011-06-08 00:25:08 +02:00
Vijay Dev
da5122e5fa fix indents and a code error in caching guide 2011-06-08 00:25:01 +02:00
Xavier Noria
296ca01f16 mention assets:clean in railties CHANGELOG 2011-06-07 22:02:36 +02:00
Xavier Noria
ea8b05c46e sprockets gzips assets now 
Conflicts:

	railties/lib/rails/tasks/assets.rake
 2011-06-07 22:00:21 +02:00
Dmitriy Kiriyenko
54f5fb5dc3 Do not use default_scope in ActiveRecord::Persistence#touch. 2011-06-07 18:43:24 +01:00
Dmitriy Kiriyenko
96711aa0a9 This way asserting that updated_at was changed in touch look more obvious. 2011-06-07 18:43:24 +01:00
Aaron Patterson
a9959115e6 Merge pull request #1528 from chriseppstein/3-1-stable 
Update project Gemfile to use the sass-rails rc
 2011-06-07 10:11:26 -07:00
Chris Eppstein
654514a306 Use the sass-rails release candidate until full release. 2011-06-07 10:08:19 -07:00
José Valim
69b25ebb2b Merge pull request #1527 from guilleiguaran/3-1-stable 
Rails::Server#app should be nice with Rack::URLMap (3.1 stable)
 2011-06-07 09:41:57 -07:00
Guillermo Iguaran
8d758d87a9 Fixing Rails::Server#app under Rack::URLMap 2011-06-07 11:36:02 -05:00
Xavier Noria
645f138c55 adds missing require 2011-06-07 12:07:00 +02:00
Aaron Patterson
377b15a223 make sure AR isolated tests set the environment variable 2011-06-06 18:01:19 -07:00
Aaron Patterson
75fb26aeca oops! add parens so the block is properly bound 2011-06-06 16:59:51 -07:00
Aaron Patterson
945b131eb2 set the environment variable from the rake file 2011-06-06 16:51:28 -07:00
Aaron Patterson
606108a069 more oracle fixes 2011-06-06 15:46:50 -07:00
Aaron Patterson
50d331d551 do not muck with the load path, that is the test task responsibility 2011-06-06 15:46:50 -07:00