aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* change to use the Sass file extension .scssSebastian Martinez2011-04-141-1/+1
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* The controller and resource generators will now automatically produce asset ↵David Heinemeier Hansson2011-04-148-1/+73
| | | | stubs (this can be turned off with --skip-assets). These stubs will use Coffee and Sass, if those libraries are available. [DHH]
* Bring back tmp/cache for the default local cache to workDavid Heinemeier Hansson2011-04-141-1/+1
|
* Its assets.enabled, not assets.enableDavid Heinemeier Hansson2011-04-141-1/+1
|
* Cleanup the Gemfile and compute whats needed depending on whether we are on ↵David Heinemeier Hansson2011-04-132-23/+25
| | | | 1.8 or 1.9
* Generate scaffold.css to app/assets/stylesheets (next step, SCSSify it if ↵David Heinemeier Hansson2011-04-131-1/+1
| | | | SCSS is available)
* Includes have to be in the first commentDavid Heinemeier Hansson2011-04-131-1/+1
|
* Use driver_ujs now that we no longer have to depend on a shared name and ↵David Heinemeier Hansson2011-04-131-6/+0
| | | | insert all prototype dependencies if thats specified
* Use driver_ujs now that we no longer have to depend on a shared name and ↵David Heinemeier Hansson2011-04-132-1/+12
| | | | insert all prototype dependencies if thats specified
* Blah, assets cant be turned on from initializers eitherDavid Heinemeier Hansson2011-04-132-3/+3
|
* Cleanup commentsDavid Heinemeier Hansson2011-04-131-3/+1
|
* Not neededDavid Heinemeier Hansson2011-04-131-1/+0
|
* Require asset pipeline targets by defaultDavid Heinemeier Hansson2011-04-131-2/+2
|
* Require everything by defaultDavid Heinemeier Hansson2011-04-131-1/+4
|
* Dont need to make application.js into coffee since it will mostly be a ↵David Heinemeier Hansson2011-04-131-1/+1
| | | | manifest file anyway
* Move json requirement to user Gemfile -- still need to do better than this, ↵David Heinemeier Hansson2011-04-132-4/+2
| | | | though
* Use Sass from git until the final gem is outDavid Heinemeier Hansson2011-04-131-1/+1
|
* Move the asset template engines to the user-generated GemfileDavid Heinemeier Hansson2011-04-133-3/+5
|
* Generate CoffeeScript stub by defaultJoshua Peek2011-04-132-6/+6
|
* Include CoffeeScript in GemfileJoshua Peek2011-04-131-2/+4
|
* Add default require directives for jqueryJoshua Peek2011-04-131-0/+4
|
* Blah, identity_map has to be setup in application.rb to workDavid Heinemeier Hansson2011-04-133-13/+11
|
* Fix tripletsDavid Heinemeier Hansson2011-04-131-397/+1
|
* Clean up the generator, switch to assets usage, use vendor/assets for the ↵David Heinemeier Hansson2011-04-1314-46/+445
| | | | default scripts, and more
* Move to app/assets in anticipation of image support being added as well. ↵David Heinemeier Hansson2011-04-131-2/+4
| | | | Also add vendor/assets to default load path
* Until the latest sprockets gem is released, we need new apps to reference it ↵David Heinemeier Hansson2011-04-131-9/+12
| | | | directly
* Remove `#among?` from Active SupportPrem Sichanugrist2011-04-137-7/+7
| | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.
* removes some remaining .rjs occurrencesXavier Noria2011-04-131-3/+3
|
* removes debug_rjs from ActionView::BaseXavier Noria2011-04-131-1/+0
|
* jQuery is the new defaultXavier Noria2011-04-132-7/+7
|
* Index sprockets environment if perform caching is enabledJoshua Peek2011-04-122-0/+7
|
* Merge branch 'master' into sprocketsJoshua Peek2011-04-1219-41/+99
|\
| * Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵David Heinemeier Hansson2011-04-127-7/+7
| | | | | | | | suggestion!
| * Keep the same API semantics for update/delete as we had for XML (just return ↵David Heinemeier Hansson2011-04-111-2/+2
| | | | | | | | 200 OK, no body)
| * Cant use inclusion in commands/application.rb as the frameworks havent all ↵David Heinemeier Hansson2011-04-111-2/+1
| | | | | | | | been required yet
| * Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-118-8/+22
| | | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
| * Add --old-style-hash option to force creating old style hash on Ruby 1.9Prem Sichanugrist2011-04-102-2/+8
| | | | | | | | That means if you don't like the new syntax, you can pass --old-style-hash to force Rails to generate code with hash rockets.
| * Rails will now generate Ruby 1.9 style hash when running app generator on ↵Prem Sichanugrist2011-04-103-3/+12
| | | | | | | | | | | | Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate.
| * Rails will now generate Ruby 1.9 style hash when running scaffold_controller ↵Prem Sichanugrist2011-04-104-19/+29
| | | | | | | | | | | | | | | | generator on Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate. This patch has been requested by DHH.
| * Make scaffold_controller generator generate code for JSON response instead ↵Prem Sichanugrist2011-04-101-14/+14
| | | | | | | | | | | | | | | | of XML It seems like a lot of people are using JSON in their API more than XML nowadays, so Rails should follow that convention by providing the JSON format block in scaffold_controller by default. This patch has been requested by DHH
| * make turn a soft dependency. generate a Gemfile that contains turn and ↵Aaron Patterson2011-04-082-6/+14
| | | | | | | | require turn if it is available
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-031-2/+2
| |\
| | * s/ERb/ERB/gAkira Matsuda2011-04-031-2/+2
| | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
| * | Moved Turn activation/dependency to railtiesDavid Heinemeier Hansson2011-03-312-1/+9
| | |
| * | Direct logging of Active Record to STDOUT so it's shown inline with the ↵David Heinemeier Hansson2011-03-311-0/+4
| | | | | | | | | | | | results in the console [DHH]
* | | Fix assets prefix joiningJoshua Peek2011-03-301-1/+1
| | |
* | | Fix assets prefix joiningJoshua Peek2011-03-301-1/+1
| | |
* | | Fix config.assets.precompile optionJoshua Peek2011-03-301-1/+1
| | |
* | | Unify sprockets config optionsJoshua Peek2011-03-303-17/+24
| | |
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-306-34/+49
|\| | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb