aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cache (FileStore) clear should keep .gitkeepMarcos Tapajos2012-01-132-1/+8
|
* Merge pull request #4451 from guilleiguaran/add-therubyracer-commentedJosé Valim2012-01-132-6/+16
|\ | | | | Add therubyracer gem commented in default Gemfile
| * Add therubyracer gem commented in default GemfileGuillermo Iguaran2012-01-122-6/+16
| |
* | Merge pull request #4448 from lest/patch-1Santiago Pastorino2012-01-131-17/+1
|\ \ | | | | | | cleanup AV::Helpers::UrlHelper
| * | remove unused private methodsSergey Nartimov2012-01-131-16/+0
| | |
| * | use Rack::Utils.escape_pathSergey Nartimov2012-01-131-1/+1
|/ /
* | Merge pull request #4434 from carlosantoniodasilva/action-view-refactorJosé Valim2012-01-134-34/+41
|\ \ | | | | | | Action view refactor
| * | Refactor url_for helper to check for nil in the case statement onlyCarlos Antonio da Silva2012-01-121-8/+8
| | |
| * | Delegate data tag option to tag option for escapingCarlos Antonio da Silva2012-01-121-5/+6
| | |
| * | Remove value argument from boolean optionCarlos Antonio da Silva2012-01-121-2/+2
| | |
| * | Return faster when no option is givenCarlos Antonio da Silva2012-01-121-12/+11
| | |
| * | Refactor and improve readabilityCarlos Antonio da Silva2012-01-121-8/+7
| | |
| * | Split tag options helper in smaller methodsCarlos Antonio da Silva2012-01-121-9/+21
| | |
| * | Remove deprecated and not used methodCarlos Antonio da Silva2012-01-121-6/+0
| | |
| * | Extract asset paths uri regexp to a constantCarlos Antonio da Silva2012-01-121-1/+3
| | | | | | | | | | | | Avoid compiling the regexp all the time.
* | | Merge pull request #4439 from rafaelfranca/av-refactorJosé Valim2012-01-131-4/+3
|\ \ \ | | | | | | | | Do not check if record is an Array twice
| * | | Do not check if record is an Array twiceRafael Mendonça França2012-01-121-4/+3
| | |/ | |/|
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-131-1/+3
|\ \ \
| * | | Update Railties section of 3.2 release notesGuillermo Iguaran2012-01-121-1/+3
| | | |
* | | | revise wording [ci skip]Vijay Dev2012-01-131-2/+1
| | | |
* | | | Merge pull request #4443 from guilleiguaran/changelog-3-2-stableVijay Dev2012-01-121-2/+5
|\ \ \ \ | |_|/ / |/| | | Update railties 3.2.0 changelog
| * | | Update railties 3.2.0 changelogGuillermo Iguaran2012-01-121-2/+5
|/ / /
* | | Merge pull request #4432 from lest/patch-1Santiago Pastorino2012-01-121-28/+0
|\ \ \ | | | | | | | | to_date, to_time, and to_datetime Time methods present in ruby 1.9
| * | | to_date, to_time, and to_datetime Time methods present in ruby 1.9Sergey Nartimov2012-01-131-28/+0
| | |/ | |/|
* / | warns against using temporary subscribersXavier Noria2012-01-121-0/+4
|/ /
* | fix rails binary path when using --dev [ci skip]Vijay Dev2012-01-132-2/+2
| |
* | Added note about [ci skip] tag to contributing guidePiotr Sarnacki2012-01-121-0/+2
| |
* | deprecates Module#local_constant_namesXavier Noria2012-01-125-6/+27
| |
* | add info about kindle guides in the release guideVijay Dev2012-01-131-0/+4
| |
* | prepare for 3.2 guides release :)Vijay Dev2012-01-131-1/+1
| |
* | remove hidden link in guides layoutVijay Dev2012-01-131-1/+0
| |
* | Merge pull request #4429 from marcinbunsch/1923-force-ssl-redirect-keep-flashJosé Valim2012-01-122-1/+38
|\ \ | | | | | | When force redirecting to SSL, make sure that the session is kept
| * | When force redirecting to SSL, make sure that the session is kept. As we're ↵Marcin Bunsch and Przemek Dąbek2012-01-122-1/+38
| | | | | | | | | | | | moving from a non-secure to secure environment, it's safe
* | | moving to arel 3.0.0Aaron Patterson2012-01-121-1/+1
| | |
* | | depend on journey 1.0.0Aaron Patterson2012-01-121-1/+1
| | |
* | | moving the table and index test to it's own fileAaron Patterson2012-01-122-19/+24
| | |
* | | Fix table_name in ActiveRecord with more than one abstract ancestorsPiotr Sarnacki2012-01-122-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When subclassing abstract_class table_name should be always computed based on class name, no matter if superclass is subclassing base or another abstract_class. So: class FirstAbstract < ActiveRecord::Base self.abstract_class = true end class SecondAbstract < FirstAbstract self.abstract_class = true end class Post < SecondAbstract self.table_name #=> 'posts' (not 'second_abstracts') end
* | | Merge pull request #4387 from Karunakar/releasenotesVijay Dev2012-01-123-6/+6
|\ \ \ | |_|/ |/| | Added the release dates for rails 3.1.1, rails 3.1.2, rails 3.1.3
| * | Added the release dates for rails 3.1.1, rails 3.1.2, rails 3.1.3Karunakar (Ruby)2012-01-083-6/+6
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-131-2/+2
|\ \ \
| * | | Changed 'proc' to 'Proc.new' in ActionController::Caching::Actions descriptionAlejandro Andrés2012-01-121-2/+2
| | | |
* | | | add 3.2 release notes to the guides indexVijay Dev2012-01-131-0/+4
| | | |
* | | | minor editsVijay Dev2012-01-132-2/+2
| | | |
* | | | fixes in api docsVijay Dev2012-01-135-6/+6
| | | |
* | | | First attempt at providing a 'what to update' section for Rails 3.1Vijay Dev2012-01-131-0/+100
| | | |
* | | | minor revision in 3.2 release guideVijay Dev2012-01-131-1/+1
| | | |
* | | | Merge pull request #4427 from kennyj/fix_3980José Valim2012-01-122-4/+22
|\ \ \ \ | | | | | | | | | | Fix GH #3980. Support assets:cache:clean task.
| * | | | Fix GH #3980. Support assets:cache:clean method to respect sprockets cache.kennyj2012-01-132-4/+22
| | |_|/ | |/| |
* | | | Merge pull request #4414 from ask4prasath/changesAaron Patterson2012-01-121-4/+4
|\ \ \ \ | | | | | | | | | | changing self.attribute to @atrribute to follow one kind of value assign...
| * | | | changing self.attribute to @atrribute to follow one kind of value assignment ↵prasath2012-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | through out the file