Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3747 from lest/middleware-logger | José Valim | 2011-11-25 | 1 | -1/+2 |
|\ | | | | | middlewares should have configurable logger | ||||
| * | middlewares should use logger from env | lest | 2011-11-25 | 1 | -1/+2 |
| | | |||||
* | | I suck, forgot to also change rake's task description | Piotr Sarnacki | 2011-11-25 | 1 | -1/+1 |
| | | |||||
* | | Display mounted engines in `rake routes` by default | Piotr Sarnacki | 2011-11-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'serializers' | José Valim | 2011-11-25 | 7 | -1/+83 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md | ||||
| * | | Add a hook for serializers in the scaffold generator (off for now). | José Valim | 2011-11-25 | 2 | -1/+4 |
| | | | |||||
| * | | Add generators for serializers. | José Valim | 2011-11-25 | 5 | -0/+79 |
| | | | |||||
* | | | Added tests for #3751 | ganesh | 2011-11-25 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Allow to display engine's routes when running `rake routes ENGINES=true` | Piotr Sarnacki | 2011-11-24 | 2 | -4/+35 |
| | | |||||
* | | Allow to change engine's loading priority with config.railties_order= | Piotr Sarnacki | 2011-11-23 | 3 | -4/+47 |
| | | |||||
* | | Merge pull request #3731 from HeeL/master | Yehuda Katz | 2011-11-23 | 1 | -3/+14 |
|\ \ | |/ |/| | code stats calculation | ||||
| * | improved code stats calculation, check on multiline comments and rewrite ↵ | Sergey Parizhskiy | 2011-11-23 | 1 | -3/+14 |
| | | | | | | | | regexps according to a class naming convention | ||||
* | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 3 | -18/+31 |
|/ | | | | methods directly. | ||||
* | Merge pull request #3724 from marcandre/media_default | Yehuda Katz | 2011-11-22 | 2 | -2/+2 |
|\ | | | | | stylesheet_tag default's media is "screen" | ||||
| * | Make explicit the default media when calling stylesheet_tag and change the ↵ | Marc-Andre Lafortune | 2011-11-22 | 2 | -2/+2 |
| | | | | | | | | default generators. | ||||
* | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 1 | -1/+1 |
| | | |||||
* | | Remove the -h option to dbconsole which is the shorter form of --header | Vijay Dev | 2011-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | This is done since the -h option to dbconsole hides the conventional -h for help and forces users to use --help to see the usage options for dbconsole. | ||||
* | | fix warning about instance variable in plugin generator | lest | 2011-11-19 | 1 | -7/+7 |
| | | |||||
* | | fix rails plugin new CamelCasedName bug | lest | 2011-11-19 | 1 | -4/+16 |
| | | | | | | | | refs #3684 | ||||
* | | Move schema_format :sql config setting from test.rb to application.rb | Alex Tambellini | 2011-11-17 | 2 | -5/+5 |
| | | | | | | | | | | | | I've moved the schema_format :sql config setting to application.rb because you would never enable this only for the test environment. If you use database constraints or database specific data types you would want all of your environments to use them. | ||||
* | | Substituted RailsCommands for Rails::Commands | Daniel Dyba | 2011-11-16 | 1 | -159/+161 |
| | | |||||
* | | Changed Commands module to RailsCommands. | Daniel Dyba | 2011-11-16 | 1 | -3/+3 |
| | | | | | | | | | | | | This is to avoid a conflict that occurs when you add Rake to your Gemfile. There is a Commands Object in Rake that conflicts with the Commands module in plugin.rb. See rails issue #1866. | ||||
* | | Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile | José Valim | 2011-11-14 | 1 | -0/+1 |
|\ \ | | | | | | | Added therubyrhino to default Gemfile under JRuby | ||||
| * | | Added therubyrhino to default Gemfile under JRuby | Guillermo Iguaran | 2011-11-14 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-13 | 1 | -6/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | fixed example code indentation | Wojciech Wnętrzak | 2011-11-10 | 1 | -6/+6 |
| | | | |||||
* | | | Fixed error with 'rails generate new plugin' where the .gitignore was not ↵ | Tyler Coville | 2011-11-09 | 2 | -4/+4 |
| | | | | | | | | | | | | properly generated if --dummy-path was used and added test case | ||||
* | | | Extend IRB right before starting IRB to remove dependency on IRB from ↵ | Akira Matsuda | 2011-11-10 | 2 | -2/+2 |
| | | | | | | | | | | | | Rails::Application | ||||
* | | | Merge pull request #3509 from amatsuda/console_extend_command_bundle | José Valim | 2011-11-09 | 3 | -27/+37 |
|\ \ \ | | | | | | | | | move Rails console top level methods to IRB context | ||||
| * | | | Modulize Rails console methods so that other console libraries such as Pry ↵ | Akira Matsuda | 2011-11-09 | 3 | -4/+6 |
| | | | | | | | | | | | | | | | | can include these methods | ||||
| * | | | move Rails console top level methods to IRB context | Akira Matsuda | 2011-11-04 | 2 | -27/+35 |
| | |/ | |/| | |||||
* | | | CHANGELOG => CHANGELOG.md | Arun Agrawal | 2011-11-09 | 1 | -2/+2 |
| | | | | | | | | | | | | I missed these in previous commit | ||||
* | | | Refactor test:uncommitted task. | Arun Agrawal | 2011-11-09 | 1 | -10/+3 |
| |/ |/| | | | Thanks to @sobrinho (Gabriel Sobrinho) | ||||
* | | Should be checking if file exists or not. | Arun Agrawal | 2011-11-08 | 1 | -3/+9 |
| | | | | | | | | | | | | I found this bug when running rake test:uncommitted on a newly generated rails app which don't have test file for application_controller. Can see detail here #3461 | ||||
* | | CHANGELOG to CHANGELOG.md | Arun Agrawal | 2011-11-08 | 1 | -5/+5 |
| | | |||||
* | | Remove redundant blank line at the bottom | Akira Matsuda | 2011-11-07 | 1 | -1/+1 |
| | | |||||
* | | Add arel to Gemfile on apps generated in edge Rails | Guillermo Iguaran | 2011-11-05 | 1 | -0/+2 |
|/ | |||||
* | treat USAGE as an ERB template | Colin MacKenzie IV | 2011-11-02 | 1 | -1/+1 |
| | |||||
* | Removing db/seeds.rb is fine. Don't blow up. | Jeremy Kemper | 2011-10-29 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_route | José Valim | 2011-10-29 | 1 | -7/+8 |
|\ | | | | | Remove trailing "#" on rake routes for controller only routes | ||||
| * | On inpsect routes, show :controller and :action to indicate dynamic. | Hendy Tanata | 2011-10-29 | 1 | -7/+8 |
| | | |||||
* | | method redefined warning removed! | Arun Agrawal | 2011-10-29 | 1 | -0/+1 |
|/ | |||||
* | Scaffold returns 204 No Content for API requests without content. This makes ↵ | José Valim | 2011-10-26 | 1 | -2/+2 |
| | | | | scaffold work with jQuery out of the box. | ||||
* | Remove needless to_param in scaffold functional test | Alexey Vakhov | 2011-10-24 | 1 | -4/+4 |
| | |||||
* | Merge pull request #3408 from guilleiguaran/remove-turn | José Valim | 2011-10-22 | 2 | -13/+0 |
|\ | | | | | Remove Turn from default Gemfile. | ||||
| * | Remove Turn from default Gemfile. | Guillermo Iguaran | 2011-10-22 | 2 | -13/+0 |
| | | | | | | | | We still looking for a best presentation for tests output. | ||||
* | | Revert "Merge pull request #3405 from arunagw/middleware_name" | Aaron Patterson | 2011-10-22 | 1 | -1/+1 |
|/ | | | | | This reverts commit c33090523c3504a2a125d7f725a7f2a4b99ff3c0, reversing changes made to 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4. | ||||
* | Using middleware name to show proper name in the info | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | |||||
* | Don't use :path in Gemfile for --dev except for Rails. | José Valim | 2011-10-20 | 2 | -3/+1 |
| | |||||
* | Fix the proper production.rb | David Heinemeier Hansson | 2011-10-19 | 1 | -1/+4 |
| |