aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2116 from guilleiguaran/fix-environment-generator-actionSantiago Pastorino2011-07-182-2/+10
|\ | | | | Fix Rails::Generators::Actions#environment when env is passed
| * Fix Rails::Generators::Actions#environment when env is passed. Closes #2110Guillermo Iguaran2011-07-182-2/+10
| |
* | As we are adding db folder in it. Required in test also.Arun Agrawal2011-07-171-1/+1
|/
* Merge pull request #2082 from htanata/rake_routes_formattingSantiago Pastorino2011-07-163-8/+100
|\ | | | | Better formatting of rake routes (issue #1991)
| * Improve formatting of route to Rack application in rake routes.Hendy Tanata2011-07-172-3/+24
| | | | | | | | | | | | | | | | | | | | This route: match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/ is shown as: /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/}
| * Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-163-7/+78
| | | | | | | | | | | | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/}
* | Merge pull request #2108 from loz/masterSantiago Pastorino2011-07-161-0/+5
|\ \ | | | | | | Adds gem helper rake tasks to engines generator
| * | Added gem helper to rake task for engines, as per pull request from ↵Jonathan Lozinski2011-07-161-0/+5
| | | | | | | | | | | | 3-1-stable, #2103
* | | Fix the output a bitSantiago Pastorino2011-07-161-2/+2
|/ /
* / Added db to gemspec files so migrations are correctly packagedJonathan Lozinski2011-07-161-1/+1
|/
* Use cache/assets instead.José Valim2011-07-124-5/+4
|
* assets.cache_store now defaults to filesystem. You will want to share ↵José Valim2011-07-125-14/+7
| | | | tmp/assets_cache between deploys.
* remove extra space since comment_if already returns the space.Teng Siong Ong2011-07-132-4/+4
|
* Ensure Dir.glob is sortedJoshua Peek2011-07-111-1/+1
|
* Generate valid default fixtures for models with a type columnMarc-Andre Lafortune2011-07-112-1/+6
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Require assets in all environments by default and provide a way to opt-out ↵José Valim2011-07-111-1/+1
| | | | from uglifier.
* Merge pull request #2029 from sikachu/acronym_mentionJosé Valim2011-07-111-0/+5
|\ | | | | Mention about acronym inflection in config/initializers/inflections.rb
| * Mention about acronym inflection in config/initializers/inflections.rbPrem Sichanugrist2011-07-111-0/+5
| | | | | | | | Closes #1366
* | Rails.application#env_config is now public API. [Closes #1924]Franck Verrot2011-07-112-0/+18
|/
* Make Rails.groups accept arrays.José Valim2011-07-102-4/+7
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-095-28/+49
|\
| * Add section about debugging assetsRyan Bigg2011-07-091-1/+25
| |
| * Clarify that per-controller asset files are not 'magically' loaded by the ↵Ryan Bigg2011-07-091-1/+1
| | | | | | | | controller, but rather need to be required
| * Updated active_record_querying.textile: intro paragraph of 'Conditions' to ↵Christopher Scott Hernandez2011-07-081-1/+1
| | | | | | | | change 'find method' to 'where method'
| * update Rails version. (rails console didn't exist in 2.1)Vijay Dev2011-07-081-1/+1
| |
| * Changed the value that log_level takes to match the examples in the ↵Oge Nnadi2011-07-081-1/+1
| | | | | | | | paragraph above
| * minor document editAkira Matsuda2011-07-081-2/+5
| | | | | | | | the sample model has only 9 lines: https://github.com/lifo/docrails/commit/4d4819fb279386570466b2f99254cd77fb71e05c#commitcomment-467295
| * :conditions => whereAkira Matsuda2011-07-082-17/+10
| |
| * rails text been added before versionJudeArasu2011-07-051-4/+5
| |
| * Remove attachment_fu, add CarrierWave to suggested uploader librariesJames Miller2011-07-051-1/+1
| |
* | Don't raise on mass assignment for testJosé Valim2011-07-072-11/+15
| |
* | Merge pull request #1767 from jwarwick/rake_notes_dirsSantiago Pastorino2011-07-071-4/+4
|\ \ | | | | | | Updated rake:notes to search additional directories
| * | Updated rake:notes to search app, config, lib, script and test dirsjwarwick2011-07-061-4/+4
| | |
* | | Just generate AR options if AR is enabledJosé Valim2011-07-072-0/+4
| | |
* | | Merge pull request #1996 from bogdan/default_sanitizer_squashedJosé Valim2011-07-072-0/+6
|\ \ \ | | | | | | | | Rails app template: setup different mass assignment sanitizer for envs
| * | | Rails app template: setup different mass assignment sanitizer for envsBogdan Gusiev2011-07-072-0/+6
| | | | | | | | | | | | | | | | | | | | For production - leave the default For test and dev: :strict.
* | | | Ensure the engine_path is there (it may make CI happy).José Valim2011-07-061-1/+1
| | | |
* | | | Make compressors lazily load.José Valim2011-07-061-0/+11
| | | |
* | | | Merge pull request #1926 from tobsch/masterSantiago Pastorino2011-07-062-5/+8
|\ \ \ \ | | | | | | | | | | Accept application.js/.css to exist in a deeper directory depth by default
| * | | | Now accepting css/js files in deeper directory structures by default.Tobias Schlottke2011-07-012-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This is useful for engines with own application.{js|css}-files. See: https://github.com/rails/rails/issues/1520
* | | | | updating pg supported versions docco. fixes #1959Aaron Patterson2011-07-053-3/+3
| | | | |
* | | | | Merge pull request #1963 from jake3030/fix_engine_rake_taskJosé Valim2011-07-052-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix engine rake task
| * | | | fix engines rake tasksJake Varghese2011-07-042-0/+10
| | | | |
* | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-056-38/+305
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Edited railties/guides/source/asset_pipeline.textile via GitHubMohammad Typaldos2011-07-031-3/+3
| | | | |
| * | | | [asset pipeline] expand section on configurationRichard Hulse2011-07-031-10/+19
| | | | |
| * | | | [asset pipeline] More updatesRichard Hulse2011-07-031-9/+13
| | | | | | | | | | | | | | | resources for fingerprinting, grammar,CSS
| * | | | [asset pipeline] Add resources to fingerprintingRichard Hulse2011-07-031-3/+2
| | | | |
| * | | | [asset pipeline] what is fingerprinting sectionRichard Hulse2011-07-031-6/+13
| | | | |
| * | | | [asset pipeline] spelling !Richard Hulse2011-07-031-3/+3
| | | | |