aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* initialize instance variablesAaron Patterson2011-06-271-0/+2
|
* oops! remove debugging codesAaron Patterson2011-06-271-1/+0
|
* default create_with_value to a hash so we can eliminate conditionals, add ↵Aaron Patterson2011-06-275-5/+14
| | | | test surrounding create_with(nil) behavior
* Merge pull request #1871 from guilleiguaran/arel-2-1-3Aaron Patterson2011-06-272-2/+2
|\ | | | | Bump ARel to 2.1.3
| * Bump ARel to 2.1.3Guillermo Iguaran2011-06-272-2/+2
| |
* | Merge pull request #1870 from chriseppstein/asset_urls_masterSantiago Pastorino2011-06-278-72/+216
|\ \ | | | | | | Asset urls master
| * | Added a configuration setting:Chris Eppstein2011-06-276-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Move the config bootstrapping to initialization to minimize access to the ↵Chris Eppstein2011-06-272-11/+14
| | | | | | | | | | | | Rails.application global.
| * | Stylesheet link tags should use the request protocol to avoid duplicate ↵Chris Eppstein2011-06-275-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add asset_url helper and refactor the asset paths so that asset hosts can be ↵Chris Eppstein2011-06-275-47/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | OrderedOptions must implement respond_to? if it implements method_missing.Chris Eppstein2011-06-272-9/+7
| | |
* | | the generated ALT attribute for images no longer contains the digest, if anyXavier Noria2011-06-272-1/+13
|/ /
* | Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)David Heinemeier Hansson2011-06-271-0/+4
| |
* | Merge pull request #1481 from arunagw/lib_assetsDavid Heinemeier Hansson2011-06-272-1/+3
|\ \ | | | | | | Generating /lib/assets for assets
| * | Using lib/assets only. Javascripts/Stylesheets people can fill later.Arun Agrawal2011-06-162-1/+3
| | |
* | | Merge pull request #1861 from dchelimsky/fixture_pathSantiago Pastorino2011-06-252-1/+8
|\ \ \ | |_|/ |/| | Get the fixture_path from self.class instead of ActiveSupport::TestCase.
| * | Get the fixture_path from self.class instead of ActiveSupport::TestCase.David Chelimsky2011-06-252-1/+8
|/ / | | | | | | | | | | 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.
* | Merge pull request #1853 from arunagw/string_parameterizeXavier Noria2011-06-251-1/+1
|\ \ | | | | | | StringToParameterizeWithNoSeparator: dashed parameter will not change.
| * | StringToParameterizeWithNoSeparator: dashed parameter will notArun Agrawal2011-06-251-1/+1
|/ / | | | | change.
* | registers support for acronyms in the CHANGELOG of Active SupportXavier Noria2011-06-241-0/+2
| |
* | Merge pull request #1648 from dlee/acronymsXavier Noria2011-06-247-103/+251
|\ \ | | | | | | Inflector support for acronyms (Issue #1366)
| * | Add acronym support to Inflector; Issue #1366David Lee2011-06-114-11/+105
| | |
| * | RefactorDavid Lee2011-06-114-94/+145
| | |
| * | Test retain delimiter in parameterization inflectorDavid Lee2011-06-112-2/+5
| | |
* | | make the logs a little simpler to view, put the render message inline with ↵James Cox2011-06-242-5/+6
| | | | | | | | | | | | 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
* | | Merge pull request #1848 from raviolicode/postgresql_order_multiple_paramsSantiago Pastorino2011-06-242-1/+8
|\ \ \ | | | | | | | | Fix for complex ordering of multiple columns on postgresql
| * | | Improve ordering of multiple columns on postgresqlLucia Escanellas2011-06-242-1/+8
| | | | | | | | | | | | | | | | | | | | * Only on postgresql, order("first asc, second asc") was invalid * Closes #1720
* | | | Merge pull request #1840 from wildchild/masterSantiago Pastorino2011-06-231-2/+2
|\ \ \ \ | | | | | | | | | | Minor formatting fix
| * | | | Minor formating fixAlexander Uvarov2011-06-241-2/+2
| | | | |
* | | | | Merge pull request #1829 from wildchild/masterJosé Valim2011-06-233-3/+32
|\| | | | | | | | | | | | | | Allow to specify roles for mass-assignment as array
| * | | | Follow rails convention by using Array.wrapAlexander Uvarov2011-06-231-2/+3
| | | | |
| * | | | Allow to specify mass-assignment roles as arrayAlexander Uvarov2011-06-233-3/+31
| | | | |
* | | | | Apply the default scope earlier when doing calculations. Fixes #1682.Jon Leighton2011-06-233-5/+24
| |/ / / |/| | |
* | | | Merge pull request #1835 from metaskills/ss_rake_masterAaron Patterson2011-06-231-6/+7
|\ \ \ \ | | | | | | | | | | Update SQL Server DB Rake Tasks
| * | | | Update SQL Server db related rake tasks.Ken Collins2011-06-231-6/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | * 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.
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-2315-99/+143
|\ \ \ \
| * | | | updated rspec linkMikhail Dieterle2011-06-231-1/+1
| | | | |
| * | | | grammar changes in named routes description and clarity around possibilities ↵Matt Jankowski2011-06-221-10/+10
| | | | | | | | | | | | | | | | | | | | for options
| * | | | font style changes in perf guideVijay Dev2011-06-221-2/+2
| | | | |
| * | | | grammar changes to log subscriber docsMatt Jankowski2011-06-221-4/+4
| | | | |
| * | | | move example code to be above reconfiguring discussion; add clarity about ↵Matt Jankowski2011-06-221-11/+16
| | | | | | | | | | | | | | | | | | | | silencers and filters; misc grammar changes - for backtrace cleaners
| * | | | Fixed typoMikhail Dieterle2011-06-221-1/+1
| | | | |
| * | | | use present tense on examplesMatt Jankowski2011-06-211-5/+5
| | | | |
| * | | | more detail on how the flow between redirect and show works, and minor grammarMatt Jankowski2011-06-211-7/+9
| | | | |
| * | | | remove extra space and clarify how an exception is made for controller wide ↵Matt Jankowski2011-06-211-3/+3
| | | | | | | | | | | | | | | | | | | | layouts
| * | | | reorder layout selection examples to occur in the order that the code does, ↵Matt Jankowski2011-06-211-5/+6
| | | | | | | | | | | | | | | | | | | | and provide more detail on why each selection is made
| * | | | singularize module and be explicit about what is deliveredMatt Jankowski2011-06-211-1/+1
| | | | |
| * | | | grammar (missing "a") and formattingMatt Jankowski2011-06-211-3/+3
| | | | |
| * | | | clarify why the only_path => false option is needed when default :host has ↵Matt Jankowski2011-06-211-4/+4
| | | | | | | | | | | | | | | | | | | | been set for mailers
| * | | | elaborate details on why to use _url instead of _path in mailersMatt Jankowski2011-06-211-2/+3
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:37:15 +0000