Skip to content

Paragraph about using variables in I18n translations was added to I18n Guide #3044

Closed
wants to merge 1,206 commits into from
@kirs
Ruby on Rails member
kirs commented Sep 16, 2011

No description provided.

josh and others added some commits Aug 24, 2011
@josh josh Bring in sprockets precompile task 4327e21
@josh josh Merge branch '3-1-0' into 3-1-stable 64c1d8a
@pixeltrix pixeltrix Add failing test case for #2654 257061d
@dmajda dmajda Make ActionController::TestCase#recycle! set @protocol to nil
This ensures that the protocol does not get carried over when there are
two or more requests in functional tests. This was a problem when e.g.
the first request was HTTP and the second request was HTTPS.

Closes #2654.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
621fe98
@tenderlove tenderlove dealing with some -w warnings on startup c29426d
@tenderlove tenderlove bumping bcrypt-ruby requirement 7286ecb
@tenderlove tenderlove bumping bcrypt-ruby requirement d7dc94a
@tenderlove tenderlove require needs to return true or false. thank you Ryan "zenspider" Davis 7c5cd40
@tenderlove tenderlove `load` should also return the value from `super` 36d06d1
@tenderlove tenderlove require needs to return true or false. thank you Ryan "zenspider" Davis b359628
@tenderlove tenderlove `load` should also return the value from `super` 93a9cad
@spastorino spastorino Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpers
Refactoring javascript_include_tag and stylesheet_link_tag Sprockets helpers
dc61b8f
@fxn fxn the command line guide is good to go 8184373
@fxn fxn the command line guide is good to go 5978fae
@tenderlove tenderlove we are *sure* we want to set the encoding, so silence warnings around it 3cbc1bd
@tenderlove tenderlove only define the encoding reader since we define the writer later on 95d35fc
@tenderlove tenderlove only backport the to_d method if it does not exist 23c5403
@tenderlove tenderlove fix ambiguous use of * 7e80394
@tenderlove tenderlove fix ambiguous * and remove unused variable 50db00d
@amatsuda amatsuda do not compute table names for abstract classes 933120c
@pixeltrix pixeltrix Don't modify params in place - fixes #2624 283f597
@rubys

Isn't that missing a splat?

$ irb
irb(main):001:0> Hash[[1,2]]
=> {}
irb(main):002:0> Hash[*[1,2]]
=> {1=>2}
irb(main):003:0>

Ruby on Rails member

No, it's a list of lists:

irb(main):001:0> Hash[[[1,2]]]
=> {1=>2}
irb(main):002:0>
arunagw and others added some commits Aug 25, 2011
@arunagw arunagw Yes we need this to pass the test. we are using config.log_level.
Fix broken test test_copying_migrations(RailtiesTest::EngineTest):
NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c>
dcb5f2b
@tenderlove tenderlove Merge pull request #2683 from arunagw/engine_test_fix
Engine test fix
9c33576
@spastorino spastorino Merge pull request #2696 from guilleiguaran/string-keys-sprockets-hel…
…pers

Removing redundant stringify_keys in Sprockets helpers
abab612
@tenderlove tenderlove Force binary data inserted for a string data type to utf-8 and log an
error.  Strings tagged as binary will be stored in sqlite3 as blobs.  It
is an error to insert binary data to a string column, so an error is
emitted in the log file.  People are highly encouraged to track down the
source of the binary strings and make sure that the encoding is set
correctly before inserting to the database.
20c0717
@guilleiguaran guilleiguaran Fix failing asset test under 1.8 aa99f8f
@spastorino spastorino Merge pull request #2701 from guilleiguaran/fix-asset-test-1.8
Fix failing asset test under 1.8
0353435
@tenderlove tenderlove stop messing with the load path, load path should be adjusted in the …
…test task
5145e98
@fxn fxn use sdoc to generate the API c563796
@fxn fxn use sdoc to generate the API 772173a
@fxn fxn deletes spurious arrow 8653ac3
@fxn fxn deletes spurious arrow 7748327
@spastorino spastorino assert_no_match cd00e3b
@tenderlove tenderlove clear and disable query cache when an exception is raised from called…
… middleware
1130b72
@tenderlove tenderlove clear and disable query cache when an exception is raised from called…
… middleware
a045033
@spastorino spastorino Bump rack-cache, rack-test, rack-mount and sprockets up c13216b
@spastorino spastorino Bump rack-cache, rack-test, rack-mount and sprockets up 65d607f
@tenderlove tenderlove fixing typo 89f540c
@guilleiguaran guilleiguaran Update Rails 3.1 CHANGELOGs c677461
@spastorino spastorino Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
Update changelogs for Rails 3.1.0
3b13fb7
@spastorino spastorino Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
Update changelogs for Rails 3.1.0
97e0a77
@spastorino spastorino bumping to 3.1.0.rc7 e4fc8e2
@spastorino spastorino Merge pull request #2724 from guilleiguaran/avoid-recursive-call-spro…
…ckets-helper

Avoid extra recursive call in Sprockets helpers
ca26feb
@spastorino spastorino bumping to 3.1.0.rc8 c4ce550
@jonleighton jonleighton The join_nodes must be passed to the JoinDependency initializer and t…
…herefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.
7abf441
@jonleighton
Ruby on Rails member

@tenderlove @spastorino we could consider backporting this to 3-1-0 branch, but my gut feeling at this stage is to err on the side of caution and get it out in 3.1.1, as this isn't a hugely severe bug.

@sethbro

This is causing a bundler conflict with Devise:

https://gist.github.com/1179831

tenderlove and others added some commits Aug 29, 2011
@tenderlove tenderlove Merge pull request #2741 from guilleiguaran/assets-manifest-yml
Read digests of assets from manifest.yml if config.assets.manifest is on
4a60a9e
@guilleiguaran guilleiguaran Add a default asset version to production config, this give to the us…
…ers an idea about how to use it
b0f3063
@rsim rsim Oracle adapter removes double quotes when quoting table and column names db41b63
@jonleighton jonleighton Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_…
…for_oracle

Fix test column names are escaped for oracle
c96788a
@rsim rsim Ensure correct ordering of results in test_update_all_with_joins_and_…
…offset_and_order

Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.
bef6ea1
@guilleiguaran guilleiguaran Configuration changes for asset pipeline: remove config.assets.allow_…
…debugging, add config.assets.compile and config.assets.digest
f443f9c
@tenderlove tenderlove Merge pull request #2747 from guilleiguaran/manifest-on-by-default
Manifest is generated by default when assets are precompiled
94e3059
@tenderlove tenderlove Merge branch '3-1-0' into 3-1-stable
* 3-1-0:
  Configuration changes for asset pipeline: remove config.assets.allow_debugging, add config.assets.compile and config.assets.digest
  Read digests of assets from manifest.yml if config.assets.manifest is on
  let SDoc add a link to the source code in GitHub for each method
  Documentation fixes
  bumping to 3.1.0.rc8
  bumping to 3.1.0.rc7
  Update Rails 3.1 CHANGELOGs
  Bump rack-cache, rack-test, rack-mount and sprockets up
  clear and disable query cache when an exception is raised from called middleware
  assert_no_match
  deletes spurious arrow
  use sdoc to generate the API
  Don't modify params in place - fixes #2624
  the command line guide is good to go
  `load` should also return the value from `super`
  require needs to return true or false. thank you Ryan "zenspider" Davis
  bumping bcrypt-ruby requirement
  Make ActionController::TestCase#recycle! set @protocol to nil
  Add failing test case for #2654

Conflicts:
	activerecord/test/cases/query_cache_test.rb
602a3c2
@tenderlove tenderlove Merge pull request #2748 from guilleiguaran/assets-version-config
Add config.assets.version to config/application.rb
eaea03b
@waynn waynn incorporate feedback from vijaydev and dasch to rephrase this to soun…
…d more natural, and some grammar fixes.
4869df1
@waynn waynn incorporate feedback from vijaydev and dasch to rephrase this to soun…
…d more natural, and some grammar fixes.
54c9a43
@fxn fxn adds the asset pipeline guide to the index 5b2e79c
@fxn fxn adds the asset pipeline guide to the index 5e293bc
@fxn fxn Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable 714128f
@jonleighton jonleighton Merge pull request #2752 from rsim/fix_test_update_all_with_joins_and…
…_offset_and_order

Ensure correct ordering of results in test_update_all_with_joins_and_offset_and_order
3a8319e
@tenderlove tenderlove Merge pull request #2748 from guilleiguaran/assets-version-config
Add config.assets.version to config/application.rb
1db0f20
@tenderlove tenderlove Merge branch '3-1-0' of github.com:rails/rails into 3-1-0
* '3-1-0' of github.com:rails/rails:
  adds the asset pipeline guide to the index
  incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.
6376e66
@guilleiguaran guilleiguaran Set default location of manifest with config.assets.manifest ee3cc8f
@tenderlove tenderlove Merge pull request #2756 from guilleiguaran/manifest-location
Change manifest.yml location with config.assets.manifest
a244d11
@tenderlove tenderlove Merge pull request #2756 from guilleiguaran/manifest-location
Change manifest.yml location with config.assets.manifest
aa94342
@spastorino spastorino Revert "Merge pull request #2647 from dmathieu/no_rescue"
This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
69c7213
@spastorino spastorino Revert "Merge pull request #2647 from dmathieu/no_rescue"
This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
8bc6fc5
@spastorino spastorino Depend on sass-rails and coffee-rails 3.1.0 49c75a8
@spastorino spastorino Depend on sass-rails and coffee-rails 3.1.0 48cdecd
@spastorino spastorino Bump sprockets up 36352ca
@spastorino spastorino Bump sprockets up c970818
@tenderlove tenderlove bumping to 3.1.0 505e845
@tenderlove tenderlove Merge branch '3-1-0' into 3-1-stable
* 3-1-0:
  bumping to 3.1.0
  Bump sprockets up
  Depend on sass-rails and coffee-rails 3.1.0
  Revert "Merge pull request #2647 from dmathieu/no_rescue"
  Merge pull request #2756 from guilleiguaran/manifest-location
  Merge pull request #2748 from guilleiguaran/assets-version-config
  adds the asset pipeline guide to the index
  incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.
7cdc9fd
@cgriego cgriego Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them …
…public." to support date implementations without private to_date/to_datetime on Time (home_run).

This reverts commit 080345baca1076a9788dff4803153600aec31f86.
e63c638
@tenderlove tenderlove Merge pull request #2760 from cgriego/home_run
Fix ActiveSupport compatibility with home_run
403dc11
@tenderlove tenderlove adding changelog dates 5c5021f
@guilleiguaran guilleiguaran Update Assets guide to reflect all the new changes 1cda269
@fxn fxn adds the release notes of 3.1 to the index dc5957a
@fxn fxn release notes: adds a couple of blank lines to get the markup right 417c31c
@fxn fxn Merge pull request #2762 from guilleiguaran/assets-documentation
Assets Guide updates
271cf98
@raybaxter raybaxter don't need edgeapi now that we are on 3.1 57dd60f
@spohlenz

The assets:precompile rake task will need to be modified for the case where config.assets.digest is set to false in production.

I am also seeing some unexpected "X isn't precompiled" errors when config.assets.compile is set to false. Not sure whether there's an issue there or not -- I will investigate further tomorrow.

Looks like I'm not the only person experiencing "X isn't precompiled" errors: #2763.
Perhaps a solution is to explicitly set config.assets.compile to true within the rake task.

Ruby on Rails member

@spohlenz: Yes, looks like an issue when config.assets.digest and config.assets.compile both are false.

guilleiguaran and others added some commits Aug 31, 2011
@guilleiguaran guilleiguaran Always enable digest and compile in the Rake task 3f29342
@josevalim josevalim Merge pull request #2768 from guilleiguaran/fix-assets-rake-task
Always enable digest and compile in the Rake task
d6a0078
@tenderlove tenderlove Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable
* '3-1-stable' of github.com:rails/rails:
  Always enable digest and compile in the Rake task
  don't need edgeapi now that we are on 3.1
  release notes: adds a couple of blank lines to get the markup right
  adds the release notes of 3.1 to the index
  Update Assets guide to reflect all the new changes
  Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public." to support date implementations without private to_date/to_datetime on Time (home_run).
8812807
@dhh dhh Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore
Add .rbenv-version to .gitignore
15b75b4
@josh
Ruby on Rails member
josh commented on 3f29342 Aug 31, 2011

I don't see why we need this. Sounds like people aren't running the precompile task with RAILS_ENV=production.

Ruby on Rails member

config.assets.digest isn't necessary since is default to true for production env but config.assets.compile is false by default for production env and it's causing problem to some users that are using erb to get assets url inside css and js files. See #2765

rhulse and others added some commits Sep 1, 2011
@rhulse rhulse Add section to pipeline docs to help people upgrading
These are the options from a brand new app, and
should help people get it right when upgrading.
8bb9bb2
@vijaydev vijaydev doc fixes d3d2cea
@kirs kirs Instructions for nginx and apache added 3fb0579
@jonleighton
Ruby on Rails member

common, CHANGELOG :) 431d766

jonleighton and others added some commits Sep 6, 2011
@jonleighton jonleighton Add CHANGELOG entry for 78c896ce83f96df2a133ac314b317c1628101f31 431d766
@dmathieu dmathieu #first doesn't take an order in this test 679a4eb
@jonleighton jonleighton Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, a…
…s they have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.
bf27792
@jonleighton jonleighton Use broken YAML that will fail with Syck as well as Psych. Fixes test…
…_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
b8d4692
@jonleighton
Ruby on Rails member

@tenderlove please confirm this looks ok to you.

This is on 3-1-stable. On 1.8.7 the YAML wasn't "broken" enough to raise an error. For some reason the same failure was not present on master - are we forcing Psych there or something, even for 1.8.7?

Ruby on Rails member

Ya, looks fine. No, we shouldn't be using psych on 1.8, only 1.9. I was trying to figure out YAML that would break on both and in 1.8. Guess I failed. :(

Ruby on Rails member

So any idea why it was not failing on master + ruby 1.8.7?

Ruby on Rails member
jonleighton and others added some commits Sep 6, 2011
@jonleighton jonleighton Ensure we are not comparing a string with a symbol in HasManyAssociat…
…ion#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.
a48e332
@jonleighton jonleighton Nested through associations: preloads from the default scope of a thr…
…ough model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.
d4b9829
@spastorino spastorino Merge pull request #2889 from guilleiguaran/perform-caching-assets
config.action_controller.perform_caching isn't used anymore in asset pipeline
a22701e
@spastorino spastorino Merge pull request #2577 from rails-noob/master
Fix double slash at start of paths when mounting an engine at the root.
699b83a
@rsutphin rsutphin Completely remove the pool when removing a connection. Fixes #2820. c5af3a6
@tenderlove tenderlove adding a statement pool for mysql and sqlite3 b37112f
@tenderlove tenderlove Database adapters use a statement pool.
Database adapters use a statement pool for limiting the number of open
prepared statments on the database.  The limit defaults to 1000, but can
be adjusted in your database config by changing 'statement_limit'.
7c04e16
@tenderlove tenderlove updating changelog with pool limit de03d4f
@tenderlove tenderlove Eliminate newlines in basic auth. fixes #2882 9959233
@tenderlove tenderlove updating changelog 4263a79
@tenderlove tenderlove Merge pull request #2897 from rsutphin/ar31-remove_connection
Patch for issue #2820
9198c7a
@holodigm holodigm Postgresql adapter: added current_schema check for table_exists? 81a19c4
@holodigm holodigm Postgresql adapter: added current_schema check for table_exists? 6a14b01
@jonleighton jonleighton Don't include any of includes, preload, joins, eager_load in the thro…
…ugh association scope.
df21e3d
@spastorino spastorino Merge pull request #2904 from guilleiguaran/refactor-assets-tests
Refactor assets tests to use add_to_config
759f3e5
@toolmantim toolmantim Make sure require_tzinfo only calls Kernel#require if TZInfo isn't al…
…ready present.

This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map)

TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)
d6d4740
@tenderlove tenderlove Merge pull request #2913 from toolmantim/3-1-stable
Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already present
4a2e619
@tenderlove tenderlove Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails
…into rawr

* https://github.com/rails/rails:
  Postgresql adapter: added current_schema check for table_exists?
  Postgresql adapter: added current_schema check for table_exists?
a6178c3
@tenderlove tenderlove use the supplied bind values 76993f6
@spastorino spastorino Merge pull request #2921 from akaspick/exists_fix_3_1
fix exists? to return false if passed nil (backport to 3-1-stable)
6a18262
@akaspick akaspick fix exists? to return false if passed nil (which may come from a miss…
…ing URL param)
44a5849
@akaspick akaspick entry for fixing exists? 8f2f39b
@akaspick akaspick fix assert_select_email to work on non-multipart emails as well as co…
…nverting the Mail::Body to a string to prevent errors.
05d4d8b
@akaspick akaspick assert_select_email fix entry 954543e
@jonleighton jonleighton Merge pull request #2926 from akaspick/assert_select_email_fix_3_1
assert_select_email fix for 3-1-stable
866303d
@tenderlove tenderlove LRU should cache per process in postgresql. fixes #1339 77e0bdd
@tenderlove tenderlove fixing file name 24b3783
@tenderlove tenderlove LRU cache in mysql and sqlite are now per-process caches. b92a025
@guilleiguaran guilleiguaran Add JavaScript and ERB section to Asset Guide 2451a68
@guilleiguaran guilleiguaran Add CoffeeScript example to JavaScript and ERB section abb0af1
@guilleiguaran guilleiguaran Add reference about "bundle install --without assets" in Precompiling…
… Assets section.
8461804
@ugisozols ugisozols Change hyphen to underscore. 7e587c2
@milgner milgner Fixed Apache configuration for gzipped assets: FilesMatch and Locatio…
…nMatch cannot be nested.
ac60460
Ryan Walker Added note about adding a javascript runtime to Gemfile for productio…
…n environment.
fa6bfce
@vijaydev vijaydev copy edit assets guide 5ed3e6a
@joelmoss joelmoss db:migrate:status correctly uses ActiveRecord::Migrator.migrations_pa…
…ths instead of only the apps db/migrate directory, which will include engine migrations.
dffd058
@metaskills

I'm glad all we have to do in the SQL Server adapter is to send the dynamic SQL in a parameterized form and let the server manage the cache based on the checksums of the SQL body :)

Will this be available in 3.0 branch as well ?
thanks

Ruby on Rails member

3.0 doesn't use a statement cache, so no, the LRU will not be added there.

jonleighton and others added some commits Sep 8, 2011
@jonleighton jonleighton Remove failing test which was wrongly introduced.
This test was introduced in pull request #2577. The author of the pull
request included the test, which was originally in #2230, at the same
time as fixing a separate (but related) bug. However, the author did not
include a fix for this test, so when #2577 was merged, a failing test
was introduced.

So I am removing the failing test for now. If anyone wants to fix the
bug, please do so and submit a complete pull request with a test and
a fix.
562277b
@spastorino spastorino Merge pull request #2876 from alex3/patch-1
Fixed assets precompile regex
082f53a
@spastorino spastorino Merge pull request #2957 from waseem/migration_status_tests
Tests for rake db:migrate:status.
7317f6c
@arunagw arunagw Adding assert for "test_form_for_with_isolated_namespaced_model" 38c7a67
@arunagw arunagw Warnings removed unused variables. Please don't add them 1ca38c6
@spastorino spastorino Merge pull request #2967 from arunagw/add_missing_assert
Add missing assert
f8c4519
@spastorino spastorino Merge pull request #2970 from deepakprasanna/master
Added a case to check the status of the migration after a rollback and redo.
c0775c6
@fxn fxn clarify that documentation bugs have to be reported as Rails issues. …
…[Closes #2858]
a7998dc
@dharmatech dharmatech getting_started.textile section 6: Correct file names in table fbcff81
@vijaydev vijaydev some copy-edits 06ed248
@michaelplaing michaelplaing Update to conform to rails 3.1 generated caode 04767d1
@alindeman alindeman Fix for :instance_reader => false code example b9c66fa
@hasanove hasanove Fix typo in "must-revalidate" header name df761ba
@spastorino spastorino Merge pull request #2969 from arunagw/warnings_removed_3_1_stable
Warnings removed 3 1 stable
96d63e1
@spastorino spastorino Merge pull request #2936 from joelmoss/migration_status
db:migrate:status not looking at all migration paths
90cd024
@kaiwren kaiwren Issue #636 - Parsing an xml file with multiple records and extra attr…
…ibutes (besides type) fails
981f076
@josevalim josevalim Merge pull request #2983 from sikachu/3-1-stable-hash-backported
Issue #636 - Parsing an xml file with multiple records and extra attribut
112c730
@josevalim josevalim Revert "Copy the bin to railties so it also works if you don't have t…
…he rails gem."

This reverts commit 20db68701a2e4e4a744c31934b0a02b68c81141f.
91f549b
@josevalim josevalim Remove rails executable from the gemspec. a299105
@jmileham jmileham ActiveResource shouldn't rely on the presence of Content-Length 184d8a2
@spastorino spastorino Merge pull request #2985 from kennyj/master
fix rails/rails#2582 (with testcase)
7e26ab1
@spastorino spastorino Merge pull request #2988 from guilleiguaran/remove-extra-line
Remove odd asignation
79509a2
@spastorino spastorino Merge pull request #2987 from kennyj/master 8c3f6f6
@spastorino spastorino Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets c289dea
@spastorino spastorino always rewrite_relative_url_root f79fac5
@guilleiguaran guilleiguaran Backport e767cda6ea17 (move assets tests to assets_test file) 3d042fa
@spastorino spastorino Merge pull request #2997 from guilleiguaran/move-assets-test-3-1-stable
Backport e767cda (move assets tests to assets_test file) to 3-1-stable
ecf38fe
@spastorino spastorino Merge pull request #3000 from guilleiguaran/fix-relative-url-root
Fix for relative url root in assets
bb93687
@spastorino spastorino Merge pull request #3001 from guilleiguaran/fix-assets-precompile-hos…
…t-test

Fix precompile asset_host test
874e012
@spastorino spastorino Fix asset_path relative_url_root method a244ad4
@vijaydev vijaydev merged the contribution guides and changed the
link in the layout accordingly
330d426
@vijaydev vijaydev change GH issue tracker url 01378f3
@vijaydev vijaydev Delete contribute.textile now that its contents are merged to the con…
…tributing_to_ruby_on_rails guide
59ba0dd
@ffmike ffmike Fix typo 4e4783f
@alanzeino alanzeino Slight change to reflect current 'destroy' code generated by scaffold…
… in 3.1 release.
c3751a4
@semaperepelitsa semaperepelitsa Fix a typo in date e66dd14
@dharmatech dharmatech getting_started.textile: Fix typos in section "Rendering a Partial Form" fbde94a
@dharmatech dharmatech getting_started.textile: Fix typo and split up a sentence in section …
…"Building a Multi-Model Form"
f74a4d8
@tenderlove tenderlove Merge pull request #2922 from wayneeseguin/master
Include ActiveRecord SQLServer Adapter by @metaskills in new application generator.
7ee8be5
@spastorino spastorino Provide a way to access to assets without using the digest, useful fo…
…r static files and emails
65cf784
@spastorino spastorino Merge pull request #3011 from guilleiguaran/disable-sprockets-server
Don't mount Sprockets if config.assets.compile is disabled
058593d
@spastorino spastorino Revert "Provide a way to access to assets without using the digest, u…
…seful for static files and emails"

This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.
f85cd49
@spastorino spastorino Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
Add missing changelog entries for actionpack
511070f
@josevalim josevalim Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precom…
…pile

Clear cache before of each precompile to avoid inconsistencies. Fixes #3014
499ea51
@jaimeiniesta jaimeiniesta Fix typos and broken link on asset pipeline guide e20d761
@bwalding bwalding Add equivalent nginx configuration 9a2fa21
@spastorino spastorino Allow asset tag helper methods to accept :digest => false option in o…
…rder to completely avoid the digest generation.
64de4dd
@spastorino spastorino Add some CHANGELOG missing stuff ae6c555
@spastorino spastorino Bumping up to 3.1.1.rc1 3f9665b
@kirs kirs "Passing variables into the translation" section added e0bc71e
@dmathieu

Please close this issue. @kirs : you need to "change commits" when you create the pull request, so it tracks the 3-1-stable branch.

@vijaydev
Ruby on Rails member

@kirs This is a bad PR. You've to ensure only your commit is in the PR. A better thing to do would be, as I mentioned earlier, do this commit in docrails.

@vijaydev vijaydev closed this Sep 16, 2011
@pixeltrix
Ruby on Rails member

Is thiis right? I have to use the image-url helper to get fingerprints added - the underscore helpers don't add fingerprints.

I just tested it and it was working either way... anyway I changed it back and added more info based on sass-rails readme.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.