Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit | Guillermo Iguaran | 2013-09-10 | 2 | -8/+6 | |
|\ \ \ \ | | | | | | | | | | | Revert fixes | |||||
| * | | | | grab executable from rubygems | Arun Agrawal | 2013-09-09 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fixed API task file | Arun Agrawal | 2013-09-09 | 1 | -7/+5 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | 1. As we have vendor in AV only 2. No more vendor in AC 3. No vendor folder in AR | |||||
* / / / | Remove BasicRendering tests | José Valim | 2013-09-09 | 1 | -62/+0 | |
|/ / / | ||||||
* | | | Merge pull request #12097 from kassio/remove-unused-delegate-on-railtie | José Valim | 2013-08-31 | 1 | -2/+0 | |
|\ \ \ | | | | | | | | | Remove unused delegate | |||||
| * | | | Remove unused delegate | Kassio Borges | 2013-08-31 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | Related with commit 4a2a504 | |||||
* | | | | Merge pull request #11912 from jonkessler/respond-to-signature-fixes | Rafael Mendonça França | 2013-08-31 | 2 | -1/+8 | |
|\ \ \ \ | |/ / / |/| | | | Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument | |||||
| * | | | update Rails::Railtie::Configuration and ↵ | Jon Kessler | 2013-08-16 | 2 | -1/+8 | |
| | | | | | | | | | | | | | | | | ActionDispatch::Response#respond_to? to accept include_private argument | |||||
* | | | | Using indent method to refactor controller generator. | wangjohn | 2013-08-31 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | [John J. Wang & Prathamesh Sonpatki] | |||||
* | | | | Fix typo in generators test helpr -> helper [ci skip] | Prathamesh Sonpatki | 2013-08-30 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Refactoring Generators::Base. | wangjohn | 2013-08-28 | 1 | -14/+17 | |
| | | | | | | | | | | | | | | | | | | | | | The defaults hash isn't used unless the +class_options+ hash has a particular key, so we don't need to compute it unless this is true. Also moving some code for extracting a module into its own method. | |||||
* | | | Comply with current umask when generating new app: | Thibault Jouan | 2013-08-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new application using the default rails generator (`rails new my_app`), it will apply some permissions bypassing the current process umask. The `bin' directory and any files inside it will always be set a mode of 0755. This change removes the current umask bits from the mode applied by the generator on the `bin' directory and its content. | |||||
* | | | Extend basic rendering, test it in railties | Łukasz Strzałkowski | 2013-08-25 | 2 | -0/+68 | |
| | | | ||||||
* | | | Add --skip-action-view to app generator | Łukasz Strzałkowski | 2013-08-25 | 4 | -2/+11 | |
| | | | ||||||
* | | | Include AV railtie when we're not loading full rails stack | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+1 | |
| | | | ||||||
* | | | Missing AV requires in railties tests | Łukasz Strzałkowski | 2013-08-25 | 2 | -0/+2 | |
| | | | ||||||
* | | | Include AV railtie in railties isolation tests | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+1 | |
| | | | ||||||
* | | | Add AV as development dependency for railties | Łukasz Strzałkowski | 2013-08-25 | 2 | -0/+3 | |
| | | | | | | | | | | | | It's needed for tests | |||||
* | | | Fix railtie tests | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+2 | |
| | | | ||||||
* | | | Add loading 'action_view' as part of rails/all | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+1 | |
| | | | ||||||
* | | | Fix typo in file path, should include extension. | Semyon Perepelitsa | 2013-08-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix the indentation on the from template of the scaffold generator | Rafael Mendonça França | 2013-08-19 | 2 | -5/+5 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 3 | -13/+10 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md | |||||
| * | | Revert "Merge branch 'master' of github.com:rails/docrails" | Vijay Dev | 2013-08-17 | 3 | -13/+10 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. | |||||
| * | | Revert "Removing obsolete html tags in favor of markdown code block" | Avner Cohen | 2013-08-06 | 2 | -51/+51 | |
| | | | | | | | | | | | | This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e. | |||||
| * | | Removing obsolete html tags in favor of markdown code block. | Avner Cohen | 2013-08-06 | 2 | -51/+51 | |
| | | | ||||||
* | | | fix build error caused by #11900. | Yves Senn | 2013-08-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | Adding LESS to rake notes | Josh Crowder | 2013-08-15 | 3 | -1/+7 | |
| | | | ||||||
* | | | Generate namespaced routes correctly for generators. Fix for #11532 | Prathamesh Sonpatki | 2013-08-14 | 3 | -1/+58 | |
| | | | ||||||
* | | | "Naked" rescue clauses only catch StandardError subclasses. | thedarkone | 2013-08-06 | 2 | -3/+6 | |
| | | | | | | | | | | | | Similar to #11497. | |||||
* | | | Add a missing require. | thedarkone | 2013-08-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | This makes the rack_logger_test.rb runnable by itself (outside of the `rake test` suite). | |||||
* | | | Use the right instrumentation name | Rafael Mendonça França | 2013-08-05 | 3 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern is event.component Closes #11769 Conflicts: railties/CHANGELOG.md | |||||
* | | | Add CHANGELOG entry for #11665 | Rafael Mendonça França | 2013-08-04 | 1 | -0/+4 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Merge pull request #11665 from mshytikov/fix-config-log_level | Rafael Mendonça França | 2013-08-04 | 2 | -1/+10 | |
|\ \ \ | | | | | | | | | Rails.logger should have level specified by config.log_level. | |||||
| * | | | Rails.logger should have level specified by config.log_level. | Max Shytikov | 2013-07-30 | 2 | -1/+10 | |
| | | | | | | | | | | | | Fix bug when log level of Rails.logger (which was set via config.logger) does not match the config.log_level. | |||||
* | | | | Revert "Isolate railties Generators Tests" | Guillermo Iguaran | 2013-08-02 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | This fixes railties tests in JRuby but break it in MRI This reverts commit fea99276c7024f183bf72a16ad9f36af4bae1d42. | |||||
* | | | | Isolate railties Generators Tests | Alex Tambellini | 2013-08-02 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | With this change jruby should pass all of the railties tests. | |||||
* | | | | Added action_view in Rails::Info | Arun Agrawal | 2013-08-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #11601 from TylerRick/dont_permanently_silence_all_warnings | Rafael Mendonça França | 2013-07-30 | 1 | -2/+0 | |
|\ \ \ \ | |/ / / |/| | | | Remove $VERBOSE = nil from tasks.rb | |||||
| * | | | Remove $VERBOSE = nil from tasks.rb | Tyler Rick | 2013-07-25 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Permanently setting $VERBOSE to nil causes unwanted side effects (warnings generated by app code are silenced when triggered by a rake task but visible otherwise). silence_warnings {} would be safer to use here since it resets $VERBOSE back to what it was when the block finishes. | |||||
* | | | | Move changelog entry to the top [ci skip] | Carlos Antonio da Silva | 2013-07-29 | 1 | -5/+7 | |
| | | | | ||||||
* | | | | Changed stylesheet load order in the stylesheet manifest generator. | Pawel Janiak | 2013-07-28 | 3 | -6/+14 | |
| |/ / |/| | | ||||||
* | | | Removed excluding vendor from API doc [ci skip] | Arun Agrawal | 2013-07-26 | 1 | -6/+3 | |
| | | | | | | | | | | | | These folder not exists in system | |||||
* | | | Excluding action_view/vendor in API [ci skip] | Arun Agrawal | 2013-07-26 | 1 | -1/+2 | |
|/ / | ||||||
* | | grab executable from rubygems | Aaron Patterson | 2013-07-25 | 1 | -1/+1 | |
| | | ||||||
* | | Use Ruby 2.0 caller_locations instead of caller if available | Akira Matsuda | 2013-07-25 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | * we no more have to manipulate the each caller strings by ourselves using caller_locations * caller_locations runs slightly faster, and creates less objects than good old caller Benchmark (loading an Engine 1000 times): caller: 262.89 ms caller_locations: 186.068 ms | |||||
* | | Privatize non-test method | Akira Matsuda | 2013-07-25 | 1 | -0/+1 | |
| | | ||||||
* | | Use GeneratedAttribute#column_name if #reference? scaffold_generator in ↵ | Zachary Scott | 2013-07-23 | 2 | -0/+29 | |
| | | | | | | | | _form view [Fixes #11573] | |||||
* | | Stop reading the same file twice for testing different content | Carlos Antonio da Silva | 2013-07-22 | 1 | -8/+4 | |
| | | | | | | | | | | assert_file already gives this functionality for free by passing multiple contents. | |||||
* | | Revert "Match Dev/Prod parity for Index Page" | Piotr Sarnacki | 2013-07-22 | 3 | -5/+3 | |
| | | | | | | | | | | | | | | | | Showing welcome page in production can expose information, which should not be visible on production if people don't override the default root route. This reverts commit b0caea29c2da9f4c8bb958019813482da297067d. |