Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 1 | -5/+5 |
|\ | |||||
| * | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 1 | -5/+5 |
| | | | | | | | | | | | | English to American English(according to Weber) | ||||
* | | Merge pull request #2198 from Karunakar/fixing_2168 | Santiago Pastorino | 2011-07-23 | 1 | -3/+3 |
|\ \ | | | | | | | Improve rails:template undefined LOCATION variable error message fixed | ||||
| * | | Improve rails:template undefined LOCATION variable error message fixed | Raghunadh | 2011-07-23 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #2196 from arunagw/issue_713 | Santiago Pastorino | 2011-07-23 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Spliting the ouput of git ls-files for running tasks Fixes #713 | ||||
| * | | | For svn files also spilt required | Arun Agrawal | 2011-07-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Spliting the ouput of git ls-files for running tasks Fixes #713 | Arun Agrawal | 2011-07-23 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2195 from castlerock/command_line_information | Santiago Pastorino | 2011-07-23 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Small missing information added to command description. --help also works | ||||
| * | | Small missing information added to command description. --help also works ↵ | Bratish Goswami | 2011-07-23 | 1 | -1/+1 |
| |/ | | | | | | | like -h. | ||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-23 | 3 | -36/+40 |
|\ \ | |/ |/| | |||||
| * | little details seen while doing a pass through what's new in docrails | Xavier Noria | 2011-07-23 | 2 | -9/+10 |
| | | |||||
| * | spacing fix | Vijay Dev | 2011-07-20 | 1 | -1/+1 |
| | | |||||
| * | grammar correction for rails/paths #add method arguments | Matt Jankowski | 2011-07-12 | 1 | -2/+2 |
| | | |||||
| * | misc grammar and clarity changes for rails/engine docs | Matt Jankowski | 2011-07-12 | 1 | -26/+29 |
| | | |||||
| * | grammar/tense correction to rails application doc | Matt Jankowski | 2011-07-12 | 1 | -1/+1 |
| | | |||||
* | | removing inline source option from rdoc task. fixes #2169 | Aaron Patterson | 2011-07-21 | 2 | -4/+4 |
| | | |||||
* | | Fix Rails::Generators::Actions#environment when env is passed. Closes #2110 | Guillermo Iguaran | 2011-07-18 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #2082 from htanata/rake_routes_formatting | Santiago Pastorino | 2011-07-16 | 1 | -2/+10 |
|\ \ | | | | | | | Better formatting of rake routes (issue #1991) | ||||
| * | | Improve formatting of route to Rack application in rake routes. | Hendy Tanata | 2011-07-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Tanata | 2011-07-16 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/master | Santiago Pastorino | 2011-07-16 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Adds gem helper rake tasks to engines generator | ||||
| * | | | Added gem helper to rake task for engines, as per pull request from ↵ | Jonathan Lozinski | 2011-07-16 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | 3-1-stable, #2103 | ||||
* | | | | Fix the output a bit | Santiago Pastorino | 2011-07-16 | 1 | -2/+2 |
|/ / / | |||||
* / / | Added db to gemspec files so migrations are correctly packaged | Jonathan Lozinski | 2011-07-16 | 1 | -1/+1 |
|/ / | |||||
* | | Use cache/assets instead. | José Valim | 2011-07-12 | 3 | -4/+3 |
| | | |||||
* | | assets.cache_store now defaults to filesystem. You will want to share ↵ | José Valim | 2011-07-12 | 3 | -13/+6 |
| | | | | | | | | tmp/assets_cache between deploys. | ||||
* | | remove extra space since comment_if already returns the space. | Teng Siong Ong | 2011-07-13 | 2 | -4/+4 |
| | | |||||
* | | Ensure Dir.glob is sorted | Joshua Peek | 2011-07-11 | 1 | -1/+1 |
| | | |||||
* | | Generate valid default fixtures for models with a type column | Marc-Andre Lafortune | 2011-07-11 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Require assets in all environments by default and provide a way to opt-out ↵ | José Valim | 2011-07-11 | 1 | -1/+1 |
| | | | | | | | | from uglifier. | ||||
* | | Merge pull request #2029 from sikachu/acronym_mention | José Valim | 2011-07-11 | 1 | -0/+5 |
|\ \ | | | | | | | Mention about acronym inflection in config/initializers/inflections.rb | ||||
| * | | Mention about acronym inflection in config/initializers/inflections.rb | Prem Sichanugrist | 2011-07-11 | 1 | -0/+5 |
| |/ | | | | | | | Closes #1366 | ||||
* / | Rails.application#env_config is now public API. [Closes #1924] | Franck Verrot | 2011-07-11 | 1 | -0/+9 |
|/ | |||||
* | Don't raise on mass assignment for test | José Valim | 2011-07-07 | 1 | -5/+0 |
| | |||||
* | Merge pull request #1767 from jwarwick/rake_notes_dirs | Santiago Pastorino | 2011-07-07 | 1 | -4/+4 |
|\ | | | | | Updated rake:notes to search additional directories | ||||
| * | Updated rake:notes to search app, config, lib, script and test dirs | jwarwick | 2011-07-06 | 1 | -4/+4 |
| | | |||||
* | | Just generate AR options if AR is enabled | José Valim | 2011-07-07 | 2 | -0/+4 |
| | | |||||
* | | Merge pull request #1996 from bogdan/default_sanitizer_squashed | José Valim | 2011-07-07 | 2 | -0/+6 |
|\ \ | | | | | | | Rails app template: setup different mass assignment sanitizer for envs | ||||
| * | | Rails app template: setup different mass assignment sanitizer for envs | Bogdan Gusiev | 2011-07-07 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | For production - leave the default For test and dev: :strict. | ||||
* | | | Merge pull request #1926 from tobsch/master | Santiago Pastorino | 2011-07-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | 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 Schlottke | 2011-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | 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 #1959 | Aaron Patterson | 2011-07-05 | 2 | -2/+2 |
| | | | | |||||
* | | | | fix engines rake tasks | Jake Varghese | 2011-07-04 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix has_migrations? check in Rails::Engine | Sam Pohlenz | 2011-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add assets_gemfile_entry. | José Valim | 2011-07-01 | 2 | -5/+11 |
|/ / / | |||||
* | | | Depend on edge version of sass-rails | Santiago Pastorino | 2011-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | Depend on edge version of coffee-rails | Santiago Pastorino | 2011-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | | | |||||
* | | | Move Coffee generators and templates to Coffee Railtie and create ↵ | Santiago Pastorino | 2011-06-29 | 6 | -14/+19 |
| | | | | | | | | | | | | javascript_engine ("js") for apps that remove Coffee gem | ||||
* | | | Merge pull request #1899 from ihower/patch_rake_test | José Valim | 2011-06-29 | 1 | -2/+6 |
|\ \ \ | | | | | | | | | Make "rake test" display not only task name but also exception message. |