Andrew White
c1938d16fd
Define ActiveSupport#to_param as to_str - closes #1663
2011-06-12 15:23:12 +01:00
Xavier Noria
e51b8fb38e
backslash insertion for RDoc main page ignores code blocks, also adds comments to explain what's this hack about
2011-06-12 15:04:02 +02:00
José Valim
edc0b2b80b
Make i18n tests more robust.
2011-06-12 12:44:27 +02:00
Xavier Noria
7c4625a113
revises the pattern that excludes generator templates in API generation
...
With the previous pattern RDoc processed
railties/lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
and that resulted in a spurious "<" class.
2011-06-12 12:09:54 +02:00
José Valim
0bbc145f68
Update CHANGELOG.
2011-06-11 18:04:27 +02:00
José Valim
c19bd4f88e
Add a deprecation for nested i18n namespace lookup.
2011-06-11 17:58:07 +02:00
José Valim
83efad01e9
Get rid of the alternate namespace lookup.
2011-06-11 17:31:11 +02:00
Santiago Pastorino and José Ignacio Costa
41b73fe033
Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
...
This reverts commit 317e7c829d
2011-06-10 23:08:58 -03:00
Aaron Patterson
e88508eb20
Merge pull request #1641 from sikachu/3-1-stable-render-inline
...
Render inline fix for 3-1-stable
2011-06-10 16:28:06 -07:00
Xavier Noria
0127cf652c
s/Bundle/Bundler/
2011-06-11 01:19:18 +02:00
Xavier Noria
467772b3ea
shell out to run bundler on app generation, see rationale in the comment
2011-06-11 01:19:10 +02:00
thoefer
dfca4d1f08
Fixed minor typo: 'Arraw' to 'Array'
2011-06-11 01:16:45 +02:00
ganesh
b3ade0cc05
shallow_path example updated
2011-06-11 01:16:40 +02:00
John Hinnegan
e17d4e0651
update palmist link on performance_testing
2011-06-11 01:16:35 +02:00
Ben Orenstein
f0d7aa25f0
Describe the user name 'variable' in a way that doesn't confuse the textile parser.
2011-06-11 01:16:18 +02:00
Bratish Goswami
3e29f6ae62
Added acronym and reference link for Model–view–controller
...
Conflicts:
README.rdoc
2011-06-11 01:14:21 +02:00
Vijay Dev
0ac6f8a77b
minor corrections in configuring guide
2011-06-11 01:13:31 +02:00
Vijay Dev
9ce59acf8c
remove generators section from command line guide in favor of the separate generator guide
2011-06-11 01:13:23 +02:00
Vijay Dev
cc1e983ab0
fix generators guide url
2011-06-11 01:13:14 +02:00
Vijay Dev
ed863a01ef
use git: rather than https: in git remote urls; else, github asks for passwords everytime we push
2011-06-11 01:13:07 +02:00
Vijay Dev
a1a1d62bc0
minor fixes from 5acf76d
2011-06-11 01:12:56 +02:00
Vijay Dev
290708ce3d
fix incorrect validation examples
...
Conflicts:
railties/guides/source/active_record_validations_callbacks.textile
2011-06-11 01:12:41 +02:00
Vijay Dev
3de9d6b0ff
fix typo
...
Conflicts:
actionmailer/lib/action_mailer/base.rb
2011-06-11 01:11:51 +02:00
Prem Sichanugrist
317e7c829d
Make sure that we don't perform in-place mutation on SafeBuffer string
...
This will make sure `render :inline` is working.
Closes #1633
2011-06-10 18:43:59 -04:00
Prem Sichanugrist
ff48edd442
Update CHANGELOG to mention the json_escape change
2011-06-10 18:43:50 -04:00
José Valim
55fd92f929
Merge pull request #1630 from BDQ/engine_migrations_3_1
...
Ensure engine migrations are copied in correct sequence for 3.1
2011-06-10 05:48:06 -07:00
Brian Quinn
b48f8090f4
Updated test to ensure correct sequence when copying engine/plugin migrations.
2011-06-10 13:02:37 +01:00
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
