Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Use new hash syntax for generators gem method | Alexey Vakhov | 2012-05-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | The Gemfile of new application uses ruby 1.9 hashes. Gem method of generators should use them too. It prevents from mixing two kinds of syntax in one file. | |||||
* | | Use require_dependency in generated controllers | Piotr Sarnacki | 2012-05-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require. | |||||
* | | Fix `rails db -h` and cosmetic fixes in usage banners | Alexey Vakhov | 2012-05-22 | 3 | -3/+8 | |
| | | | | | | | | | | | | | | Ruby tries to use '-h' as short version of '--header' by default https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L1372-1381. To force `rails db -h` prints an usage message we should add the `-h` options explicitly. | |||||
* | | Use relative path to sqlite3 db in `rails db` command | Alexey Vakhov | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Rails uses sqlit3 db file with a path relative to the rails root. It allows to execute server not from rails root only. For example you can fire `./spec/dummy/script/rails s` to start dummy application server if you develop some engine gem. Now the `rails db` command uses relative paths also and you can explore your dummy db via `./spec/dummy/script/rails db` command. | |||||
* | | using __method__ for the command method calls | Aaron Patterson | 2012-05-21 | 1 | -5/+5 | |
| | | ||||||
* | | Fix generators to help with ambiguous `ApplicationController` issue | Piotr Sarnacki | 2012-05-20 | 3 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413 | |||||
* | | Merge pull request #3359 from mrreynolds/datamapper_naming_fix | Rafael Mendonça França | 2012-05-19 | 2 | -2/+2 | |
|\ \ | |/ |/| | Fixed DataMapper namings in symbols and constants. | |||||
| * | Fixed DataMapper namings in symbols and constants. | Robert Glaser | 2011-10-18 | 2 | -2/+2 | |
| | | ||||||
* | | Remove delegated methods from generators test case | Carlos Antonio da Silva | 2012-05-19 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | `class_attribute` already generates instance readers/writers by default, so there's no need to add delegation methods. Removes some "method redefined" warnings. | |||||
* | | Improve `rake routes` output for redirects - closes #6369. | Andrew White | 2012-05-19 | 1 | -1/+1 | |
| | | ||||||
* | | Fix inspecting route redirections, closes #6369 | Łukasz Strzałkowski | 2012-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301) | |||||
* | | Revert changes related to `bundle install` fixes in `rails new` | Piotr Sarnacki | 2012-05-17 | 1 | -10/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | Reverted changes: f3482a9 Fix tests in railties 5904295 improve #6318 aed906a prevent using already loaded Gemfile for 'bundle install' In order to fix this, we need a fix in bundler related to GEM_PATH, which will allow to run tests properly. I will get this changes back when it happens. | |||||
* | | Load all the env files available in config.paths (closes #6335) | Piotr Sarnacki | 2012-05-16 | 1 | -2/+3 | |
| | | ||||||
* | | Merge pull request #6337 from bcardarella/patch-1 | Aaron Patterson | 2012-05-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Changing the indentation level of the block comment close for Sass | |||||
| * | | Changing the indentation level of the block comment close for SASS | Brian Cardarella | 2012-05-15 | 1 | -1/+1 | |
| | | | | | | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid. | |||||
* | | | improve #6318 | Michal Papis | 2012-05-15 | 1 | -4/+5 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 6 | -61/+0 | |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| * | | Removing ==Examples and last blank lines of docs from railties | Francesco Rodriguez | 2012-05-14 | 6 | -61/+0 | |
| | | | ||||||
* | | | prevent using already loaded Gemfile for 'bundle install', fix #6314 | Michal Papis | 2012-05-15 | 1 | -0/+8 | |
| | | | ||||||
* | | | Remove dates and environment variables from humans.txt | José Valim | 2012-05-14 | 1 | -2/+0 | |
| | | | ||||||
* | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵ | José Valim | 2012-05-14 | 1 | -3/+0 | |
| | | | | | | | | | | | | AS, closes #6287 | |||||
* | | | Remove remaining require 'rubygems' | Santiago Pastorino | 2012-05-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | require "rubygems" is obsolete in Ruby 1.9.3 | Kornelius Kalnbach | 2012-05-13 | 5 | -7/+0 | |
| | | | ||||||
* | | | Remove tailing spaces :scissors: [ci skip] | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Move AS set configs to AS Raitie | Santiago Pastorino | 2012-05-12 | 1 | -11/+1 | |
| | | | ||||||
* | | | Merge pull request #6271 from homakov/patch-5 | Santiago Pastorino | 2012-05-12 | 1 | -1/+11 | |
|\ \ \ | |/ / |/| | | configuration for active_support and JSON Encoding | |||||
| * | | Update railties/lib/rails/application/bootstrap.rb | Egor Homakov | 2012-05-11 | 1 | -1/+11 | |
| | | | ||||||
* | | | s/wether/whether [ci skip] | Vijay Dev | 2012-05-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #6277 from homakov/patch-6 | José Valim | 2012-05-12 | 1 | -0/+3 | |
|\ \ \ | | | | | | | | | Comment for active_support's option in application.rb | |||||
| * | | | Update railties/lib/rails/generators/rails/app/templates/config/application.rb | Egor Homakov | 2012-05-12 | 1 | -0/+3 | |
| |/ / | ||||||
* / / | Add commas missing in performance tests | Geoffrey Roguelon | 2012-05-12 | 1 | -1/+1 | |
|/ / | ||||||
* | | In robots.txt, User-agent should be all downcase except for the first 'U', ↵ | Enrico Carlesso | 2012-05-11 | 1 | -1/+1 | |
| | | | | | | | | according with http://en.wikipedia.org/wiki/Robots_exclusion_standard | |||||
* | | Fixes issue #6251 | David Padilla | 2012-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy. | |||||
* | | add humans.txt | Paul Campbell | 2012-05-08 | 1 | -0/+9 | |
| | | ||||||
* | | Merge pull request #5910 from route/rails-dbconsole | Jeremy Kemper | 2012-05-06 | 2 | -12/+29 | |
|\ \ | | | | | | | Fast path starts the database console without loading the full Rails env | |||||
| * | | More faster rails dbconsole | Dmitry Vorotilin | 2012-05-06 | 2 | -12/+29 | |
| | | | ||||||
* | | | Remove obsolete deep_dup requires | Piotr Sarnacki | 2012-05-06 | 1 | -2/+0 | |
| | | | ||||||
* | | | Nice logic for deep_dup in rails | Alexey Gaziev | 2012-05-06 | 1 | -0/+2 | |
|/ / | ||||||
* | | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 | |
| | | | | | | | | closes #4894 | |||||
* | | Add some docs and changelog entry | Carlos Antonio da Silva | 2012-05-04 | 1 | -2/+2 | |
| | | ||||||
* | | Allow overriding exception handling in threaded consumer | Carlos Antonio da Silva | 2012-05-04 | 1 | -1/+5 | |
| | | ||||||
* | | Allow configuring a different queue consumer | Carlos Antonio da Silva | 2012-05-04 | 3 | -6/+8 | |
| | | | | | | | | | | | | Also make sure to not use default queue consumer with custom queue implementation. It is up to the new queue implementation to start / shutdown the consumer. | |||||
* | | Merge pull request #5821 from Deradon/fix-engine-tasks | Piotr Sarnacki | 2012-05-03 | 1 | -1/+6 | |
|\ \ | | | | | | | Provided fix for calling rake tasks within mountable engines | |||||
| * | | Provided fix for calling rake tasks within mountable engines | Patrick Helm | 2012-04-12 | 1 | -1/+6 | |
| | | | ||||||
* | | | Merge pull request #6012 from avakhov/dbconsole-test | Piotr Sarnacki | 2012-05-03 | 1 | -22/+34 | |
|\ \ \ | | | | | | | | | Cover Rails::DBConsole with tests | |||||
| * | | | Add Rails::DBConsole tests | Alexey Vakhov | 2012-05-02 | 1 | -22/+34 | |
| | | | | ||||||
* | | | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presence | Jeremy Kemper | 2012-05-02 | 1 | -2/+0 | |
|\ \ \ \ | | | | | | | | | | | Gem const presence checking has been removed | |||||
| * | | | | Gem cont presence checking has been removed | Roman V. Babenko | 2012-05-02 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | Rakefile executable attributes and shebang lines has been removed | Roman V. Babenko | 2012-05-02 | 2 | -2/+0 | |
|/ / / / | ||||||
* / / / | Use new hash syntax in generated Gemfile | Oscar Del Ben | 2012-05-02 | 1 | -14/+14 | |
|/ / / |