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
23,631 Commits 34 Branches 105 Tags
506b2dad55f43e22f46bd85129b08bfcc7ca25dc
Commit Graph

23631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Patterson
506b2dad55 Merge pull request #1871 from guilleiguaran/arel-2-1-3 
Bump ARel to 2.1.3
 2011-06-27 14:06:00 -07:00
Santiago Pastorino
4bcb05de2d Merge pull request #1870 from chriseppstein/asset_urls_master 
Asset urls master
 2011-06-27 14:01:34 -07:00
Xavier Noria
a0960ec2d4 the generated ALT attribute for images no longer contains the digest, if any 2011-06-27 23:00:05 +02:00
Chris Eppstein
024bed387b Added a configuration setting: 
config.action_controller.default_asset_host_protocol

It's best to leave this unset.

When unset the :request protocol is used whenever it can be and
:relative is used in the other situations.

When set to :request then assets hosts will be disabled when there
is no request in scope and will use the request protocol whenever a
request is in scope.

If set to :relative, then a relative protocol is always used except
for stylesheet link tags which must use the :request protocol to
avoid double downloads in IE6&7.

Conflicts:

	actionpack/lib/sprockets/helpers/rails_helper.rb
	actionpack/test/template/sprockets_helper_test.rb
 2011-06-27 13:58:51 -07:00
Guillermo Iguaran
1c23887ab0 Bump ARel to 2.1.3 2011-06-27 15:58:40 -05:00
Chris Eppstein
2cc1bc3773 Move the config bootstrapping to initialization to minimize access to the Rails.application global. 2011-06-27 13:55:10 -07:00
Chris Eppstein
6c64e1e3a3 Stylesheet link tags should use the request protocol to avoid duplicate download of stylesheets in IE7 and IE8. 
Conflicts:

	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
	actionpack/lib/sprockets/helpers/rails_helper.rb
 2011-06-27 13:54:54 -07:00
Chris Eppstein
96137e8bd0 Add asset_url helper and refactor the asset paths so that asset hosts can be used during asset precompilation. 
Conflicts:

	actionpack/lib/action_view/asset_paths.rb
	actionpack/lib/sprockets/helpers/rails_helper.rb
	actionpack/test/template/sprockets_helper_test.rb
 2011-06-27 13:48:36 -07:00
Chris Eppstein
266b80c7b2 OrderedOptions must implement respond_to? if it implements method_missing. 2011-06-27 13:44:53 -07:00
David Heinemeier Hansson
f63f0baa59 Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby) 2011-06-27 11:59:46 +02:00
David Heinemeier Hansson
449cc3e999 Merge pull request #1481 from arunagw/lib_assets 
Generating /lib/assets  for assets
 2011-06-27 02:16:24 -07:00
Santiago Pastorino
095f0466c8 Merge pull request #1861 from dchelimsky/fixture_path 
Get the fixture_path from self.class instead of ActiveSupport::TestCase.
 2011-06-25 12:12:49 -07:00
David Chelimsky
a7af1e0051 Get the fixture_path from self.class instead of ActiveSupport::TestCase. 
This allows test classes that are not subclasses of
ActiveSupport::TestCase (like those in rspec-rails) to interact with
with this variable without having to reference ActiveSupport::TestCase.
 2011-06-25 13:59:49 -05:00
Xavier Noria
211fa2d28d Merge pull request #1853 from arunagw/string_parameterize 
StringToParameterizeWithNoSeparator: dashed parameter will not change.
 2011-06-25 06:05:11 -07:00
Arun Agrawal
4700e1fe6e StringToParameterizeWithNoSeparator: dashed parameter will not 
change.
 2011-06-25 06:17:00 +05:30
Xavier Noria
7e56bf7244 registers support for acronyms in the CHANGELOG of Active Support 2011-06-24 23:28:30 +02:00
Xavier Noria
370b380306 Merge pull request #1648 from dlee/acronyms 
Inflector support for acronyms (Issue #1366)
 2011-06-24 14:19:42 -07:00
James Cox
d446c798a5 make the logs a little simpler to view, put the render message inline with other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev 2011-06-24 13:10:06 -07:00
Santiago Pastorino
d6413f043c Merge pull request #1848 from raviolicode/postgresql_order_multiple_params 
Fix for complex ordering of multiple columns on postgresql
 2011-06-24 13:09:33 -07:00
Lucia Escanellas
9734a416fa Improve ordering of multiple columns on postgresql 
* Only on postgresql, order("first asc, second asc") was invalid
* Closes #1720
 2011-06-24 13:37:08 -03:00
Santiago Pastorino
7ca1a3d2aa Merge pull request #1840 from wildchild/master 
Minor formatting fix
 2011-06-23 16:47:56 -07:00
Alexander Uvarov
e945497955 Minor formating fix 2011-06-24 03:52:39 +06:00
José Valim
4389fc9733 Merge pull request #1829 from wildchild/master 
Allow to specify roles for mass-assignment as array
 2011-06-23 13:37:39 -07:00
Jon Leighton
87d6865bf7 Apply the default scope earlier when doing calculations. Fixes #1682. 2011-06-23 19:57:49 +01:00
Alexander Uvarov
ee044ea547 Follow rails convention by using Array.wrap 2011-06-23 23:06:52 +06:00
Aaron Patterson
8a1319dec0 Merge pull request #1835 from metaskills/ss_rake_master 
Update SQL Server DB Rake Tasks
 2011-06-23 09:45:59 -07:00
Ken Collins
b9bfb916e4 Update SQL Server db related rake tasks. 
* Uses open source smoscript since scptxfr came out in 2000.
  * Uses sqlcmd which replaces osql.
  * Takes advantage of host/user/pass passed down by TinyTDS.
 2011-06-23 12:41:39 -04:00
Xavier Noria
1f505a8ef2 Merge branch 'master' of git://github.com/lifo/docrails 2011-06-23 18:08:11 +02:00
José Valim
d49622a1f2 Edited actionpack/actionpack.gemspec via GitHub 2011-06-23 07:38:41 -07:00
José Valim
5839122059 Merge pull request #1830 from arunagw/enum_fixes 
Fixed Failing test : It should be Enumerable::Enumerator
 2011-06-23 05:51:00 -07:00
Arun Agrawal
deb60a738c Using slice for instead of gsub to pass with 1.8.7 2011-06-23 18:17:37 +05:30
Mikhail Dieterle
06fe01a337 updated rspec link 2011-06-23 03:08:32 -07:00
Alexander Uvarov
528f405cdc Allow to specify mass-assignment roles as array 2011-06-23 12:56:39 +06:00
Santiago Pastorino
87b548ccac Minor refactor 2011-06-23 00:35:54 -03:00
Santiago Pastorino
22e86c10d8 fixtures :all is already included in test_helper.rb 2011-06-23 00:35:25 -03:00
Santiago Pastorino
7f6eed0447 Merge pull request #1796 from jdeseno/master 
link_to doesn't allow rel attribute when also specifying method
 2011-06-22 20:34:33 -07:00
Santiago Pastorino
6b3342d971 Merge pull request #1798 from jeroenj/cachesweeper-fix 
Fixes an issue where cache sweepers with only after filters would have no controller object
 2011-06-22 10:48:19 -07:00
Joshua Peek
a1f8421060 Revert "Bump sprockets requirement" 
This reverts commit 458512c8fa.
 2011-06-22 11:29:11 -05:00
Jeroen Jacobs
93ff522120 Tests only after filters in cache sweepers 2011-06-22 18:00:46 +02:00
José Valim
16894982e3 Update CHANGELOG. 2011-06-22 12:52:46 -03:00
Aaron Patterson
09866cef17 Merge pull request #1790 from ernie/reverse_sql_order_fix 
Support reversal of ARel orderings in reverse_sql_order
 2011-06-22 08:30:52 -07:00
Matt Jankowski
3eaed28c5f grammar changes in named routes description and clarity around possibilities for options 2011-06-22 11:00:56 -04:00
Vijay Dev
95f827f910 font style changes in perf guide 2011-06-22 19:40:51 +05:30
Xavier Noria
5654f6870a Merge pull request #1750 from dmathieu/non_string_methods 
Calling unsafe methods which don't return a string shouldn't fail
 2011-06-22 06:30:56 -07:00
Matt Jankowski
3cfbf544ea grammar changes to log subscriber docs 2011-06-22 09:27:22 -04:00
Damien Mathieu
9fadf385d8 calling unsafe methods which don't return a string shouldn't fail 2011-06-22 15:26:21 +02:00
Matt Jankowski
32de3b8119 move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners 2011-06-22 09:06:05 -04:00
José Valim
53444b861c Merge pull request #1813 from arunagw/jruby_tests 
Tests Added for jdbc option added for Jruby
 2011-06-22 05:02:52 -07:00
Mikhail Dieterle
98623a061e Fixed typo 2011-06-22 03:04:28 -07:00
José Valim
3c8c379848 Merge pull request #1778 from spohlenz/hash-models 
Fix nested fields_for when Hash-based model is passed.
 2011-06-22 02:33:12 -07:00