Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12365 from jbaudanza/reorder | Guillermo Iguaran | 2013-12-01 | 1 | -5/+5 |
|\ | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack | ||||
| * | Move Rack::Cache after AD::Static in the stack | Jonathan Baudanza | 2013-09-25 | 1 | -5/+5 |
| | | |||||
* | | Use .railsrc while creating new plugin if available | Prathamesh Sonpatki | 2013-12-01 | 1 | -0/+14 |
| | | | | | | | | - Fixes #10700 | ||||
* | | config.assets.enabled isn't used anymore to disable Rails asset pipeline | Guillermo Iguaran | 2013-12-01 | 1 | -5/+0 |
| | | |||||
* | | Honor to RAILS_GROUPS env variable while loading gems with Bundler | Guillermo Iguaran | 2013-12-01 | 1 | -1/+1 |
| | | |||||
* | | Fix URL to robots.txt documentation | Christophe Maximin | 2013-11-29 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-11-24 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb | ||||
| * | | Change syntax format for example returned values | Prem Sichanugrist | 2013-11-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip] | ||||
* | | | Remove turbolinks when generating a new application based on a template | Lauro Caetano | 2013-11-21 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | that skips it. It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template. | ||||
* | | | Merge pull request #12994 from sbagdat/fix_for_info_title | Rafael Mendonça França | 2013-11-21 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | Fix for titles of info pages | ||||
| * | | | Fix for titles of info pages | Sıtkı Bağdat | 2013-11-22 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Both `rails/info/properties` and `rails/info/routes` have same html title attribute as *Routes*. This commit includes a fix for the titles. | ||||
* | | | | Merge pull request #12970 from prathamesh-sonpatki/issue12885 | Carlos Antonio da Silva | 2013-11-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add positional information to eval call so that this information will be used in printing correct location where the exception occurred. Closes #12885. | ||||
| * | | | | Add positional information to eval call so that this information will | Prathamesh Sonpatki | 2013-11-20 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be used in printing correct location where the exception occurred. Closes #12885 - Without this the location of exception is always the line on which 'eval' is called - But if the exception occurs in a gem outside of Rails, then that location is not printed in stacktrace | ||||
* / / / | replace U+00A0 with whitespace | Dmitriy Budnik | 2013-11-21 | 3 | -8/+8 |
|/ / / | |||||
* | | | [ci skip] `apropriate` => `appropriate`, spaces added | Akshay Vishnoi | 2013-11-19 | 1 | -19/+19 |
| | | | |||||
* | | | [ci skip]updated documentation: added sass and less extensions | Kuldeep Aggarwal | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | Instrument each load config initializer | Paul Nikitochkin | 2013-11-16 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | In order to simplify profiling loading of initializers, added instument for tracking load config initializer event from `config/initializers` | ||||
* | | | avoiding iterations and calling of underscore on all elements of array | Akshay Vishnoi | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | Revert "Used Yield instead of block.call" -- this causes all of ↵ | David Heinemeier Hansson | 2013-11-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd. | ||||
* | | | Merge pull request #12889 from kuldeepaggarwal/speed_ups | Rafael Mendonça França | 2013-11-14 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Used Yield instead of block.call | ||||
| * | | | Used Yield instead of block.call | Kuldeep Aggarwal | 2013-11-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #12695 from mikepack/allow_pathnames | Yves Senn | 2013-11-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Allow Pathnames to be added to eager load paths | ||||
| * | | | | Allow Pathnames to be added to eager load paths | Mike Pack | 2013-11-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Make static error pages responsive | Etienne Lemay | 2013-11-11 | 3 | -32/+53 |
|/ / / / | |||||
* | | | | Fix missing line and shadow on static error pages [ci skip] | Dmitry Korotkov | 2013-11-11 | 3 | -0/+6 |
| | | | | |||||
* | | | | Update tzinfo dependency to ~> 1.1 | Erik Michaels-Ober | 2013-11-10 | 1 | -0/+5 |
|/ / / | | | | | | | | | | Include the tzinfo-data in the generated Gemfile on Windows. | ||||
* | | | Require the top file and autoload Base class | Rafael Mendonça França | 2013-11-09 | 3 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | The generators entry point file is rails/generators so we need to make sure uers will be able to use the generators when requiring that file. Fixes #12802 | ||||
* | | | Merge pull request #12803 from arunagw/remove-unused-require | Rafael Mendonça França | 2013-11-08 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | Removed unused require | ||||
| * | | | Removed unused require | Arun Agrawal | 2013-11-08 | 1 | -2/+0 |
| | | | | |||||
* | | | | Extract common database defaults; better use of YAML | Benjamin Fleischer | 2013-11-08 | 11 | -145/+85 |
|/ / / | |||||
* | | | Added platform dependent gems | Arun Agrawal | 2013-11-07 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | See #12475 If people are on rbx they will get the desired gem | ||||
* | | | Fixed plugin_generator test | Arun Agrawal | 2013-11-07 | 1 | -1/+4 |
|/ / | | | | | | | | | | | | | | | | | | | Template replay needs to happen after bundle. As we are doing TemplateRecording in apply_rails_template. here are few commits for changes 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356 9104702be61253f9448ca070a22fc86bb4299555 | ||||
* | | Aesthetics | Rafael Mendonça França | 2013-11-07 | 1 | -13/+13 |
| | | |||||
* | | Merge pull request #12787 from notalex/extract_method | Rafael Mendonça França | 2013-11-07 | 1 | -23/+34 |
|\ \ | | | | | | | Extract method refactoring for Rails::Server#start | ||||
| * | | Move interrupt information to print_boot_information method | Alex Johnson | 2013-11-07 | 1 | -4/+1 |
| | | | |||||
| * | | Extract method refactoring for Rails::Server#start | Alex Johnson | 2013-11-07 | 1 | -24/+38 |
| | | | |||||
* | | | only ask for these ivars if the target responds to them | Aaron Patterson | 2013-11-06 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #12752 from notalex/expand_path_refactoring | Yves Senn | 2013-11-05 | 1 | -1/+1 |
|\ \ | | | | | | | Refactor File.expand_path usage to remove additional File.join | ||||
| * | | Refactor File.expand_path usage to remove additional File.join | Alex Johnson | 2013-11-05 | 1 | -1/+1 |
| | | | |||||
* | | | oops, template replay needs to happen after bundle. :orz: | Aaron Patterson | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | application template respects Gemfile entries | Aaron Patterson | 2013-11-04 | 1 | -0/+5 |
| | | | |||||
* | | | gems can be added or skipped from the template | Aaron Patterson | 2013-11-04 | 2 | -2/+65 |
| | | | |||||
* | | | Remove extra whitespace | Colin Bartlett | 2013-11-04 | 1 | -1/+1 |
|/ / | | | | | | | | | When generating an app with --skip_active_record, an extra line of whitespace was included unnecessarily. | ||||
* | | BACKTRACE environment variable to show unfiltered backtraces. | Yves Senn | 2013-11-04 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | We used to support the `BACKTRACE` environment variable but when we switched to MiniTest it got removed: f9382cd7948 This commit adds back the functionality to show the unfiltered backtrace when needed. This also works when you run your tests with `rake`: * `BACKTRACE=1 bin/rake test` * `BACKTRACE=1 ruby -Itest ...` | ||||
* | | No web-console for now | Arun Agrawal | 2013-11-03 | 1 | -6/+0 |
| | | |||||
* | | Merge pull request #12733 from robin850/fix-railties-build | Rafael Mendonça França | 2013-11-01 | 3 | -3/+3 |
|\ \ | | | | | | | Fix railties build | ||||
| * | | Set the destination_root for plugins | Robin Dupret | 2013-11-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | Since the plugin generator is relying on the application one, we need to define the proper root when creating the plugin. The AppBase class is not setting the destination_root (this is done via the AppGenerator) | ||||
| * | | Remove "circular require considered harmful" error | Robin Dupret | 2013-11-01 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | rails/generators should not load rails/generators/base since the latter is loading it. | ||||
* | | | Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunk | Rafael Mendonça França | 2013-11-01 | 11 | -15/+15 |
|\ \ \ | | | | | | | | | More Warnings removed for ruby trunk | ||||
| * | | | shadowing variable warning removed | Arun Agrawal | 2013-11-01 | 1 | -1/+1 |
| | | | |