aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Fix `rails db -h` and cosmetic fixes in usage bannersAlexey Vakhov2012-05-224-3/+26
| | | | | | | 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` commandAlexey Vakhov2012-05-222-7/+12
| | | | | | | | | | 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 callsAaron Patterson2012-05-212-5/+64
|
* Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-204-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_fixRafael Mendonça França2012-05-194-13/+13
|\ | | | | Fixed DataMapper namings in symbols and constants.
| * Fixed DataMapper namings in symbols and constants.Robert Glaser2011-10-184-13/+13
| |
* | Add CHANGELOG entry for #6369 & #6391Andrew White2012-05-191-0/+2
| |
* | Remove delegated methods from generators test caseCarlos Antonio da Silva2012-05-191-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.
* | Remove warning in namespaced generator testCarlos Antonio da Silva2012-05-191-1/+1
| |
* | Fix railties testsPiotr Sarnacki2012-05-191-1/+1
| | | | | | | | | | Minitest uses different signature for assert_no_match, so we have to swap arguments.
* | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-192-5/+8
| |
* | Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-182-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301)
* | More DRY route inspect testsŁukasz Strzałkowski2012-05-181-26/+18
| |
* | Revert changes related to `bundle install` fixes in `rails new`Piotr Sarnacki2012-05-172-17/+3
| | | | | | | | | | | | | | | | | | | | | | 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 Sarnacki2012-05-163-3/+14
| |
* | Merge pull request #6337 from bcardarella/patch-1Aaron Patterson2012-05-161-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 Cardarella2012-05-151-1/+1
| | | | | | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* | | Fix tests in railtiesPiotr Sarnacki2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since `bundle install` was fixed in `rails plugin new`, it now requires `rails 4.0.0.beta` version in filesystem when running tests. Instead of providing it, we can run tested command with `--dev` option, to use rails from the local directory.
* | | improve #6318Michal Papis2012-05-152-5/+11
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-156-61/+0
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | Removing ==Examples and last blank lines of docs from railtiesFrancesco Rodriguez2012-05-146-61/+0
| | |
* | | prevent using already loaded Gemfile for 'bundle install', fix #6314Michal Papis2012-05-151-0/+8
| | |
* | | Remove not used date variable and another test warningCarlos Antonio da Silva2012-05-141-2/+1
| | |
* | | Remove assertion on date from humans.txt testsJosé Valim2012-05-141-1/+1
| | |
* | | Remove dates and environment variables from humans.txtJosé Valim2012-05-141-2/+0
| | |
* | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵José Valim2012-05-141-3/+0
| | | | | | | | | | | | AS, closes #6287
* | | Merge pull request #6307 from oscardelben/refactor_app_generator_testCarlos Antonio da Silva2012-05-131-22/+20
|\ \ \ | | | | | | | | Refactor App Generator Test
| * | | Refactor App Generator TestOscar Del Ben2012-05-131-22/+20
| | | |
* | | | Remove remaining require 'rubygems'Santiago Pastorino2012-05-131-1/+1
| | | |
* | | | require "rubygems" is obsolete in Ruby 1.9.3Kornelius Kalnbach2012-05-135-7/+0
|/ / /
* | | Remove tailing spaces :scissors: [ci skip]Rafael Mendonça França2012-05-121-1/+1
| | |
* | | Move AS set configs to AS RaitieSantiago Pastorino2012-05-121-11/+1
| | |
* | | Merge pull request #6271 from homakov/patch-5Santiago Pastorino2012-05-121-1/+11
|\ \ \ | |/ / |/| | configuration for active_support and JSON Encoding
| * | Update railties/lib/rails/application/bootstrap.rbEgor Homakov2012-05-111-1/+11
| | |
* | | s/wether/whether [ci skip]Vijay Dev2012-05-121-1/+1
| | |
* | | Merge pull request #6277 from homakov/patch-6José Valim2012-05-121-0/+3
|\ \ \ | | | | | | | | Comment for active_support's option in application.rb
| * | | Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-121-0/+3
| | | |
* | | | Add commas missing in performance testsGeoffrey Roguelon2012-05-121-1/+1
|/ / /
* / / Remove useless load path modificationsSantiago Pastorino2012-05-112-4/+4
|/ /
* | In robots.txt, User-agent should be all downcase except for the first 'U', ↵Enrico Carlesso2012-05-111-1/+1
| | | | | | | | according with http://en.wikipedia.org/wiki/Robots_exclusion_standard
* | Fixes issue #6251David Padilla2012-05-101-1/+1
| | | | | | | | | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* | Failing test for #6251Piotr Sarnacki2012-05-101-0/+7
| |
* | registers ceb1dcc in the CHANGELOGXavier Noria2012-05-091-0/+2
| |
* | Adding test for humans.txtArun Agrawal2012-05-081-0/+6
| |
* | add humans.txtPaul Campbell2012-05-081-0/+9
| |
* | Fix buildPiotr Sarnacki2012-05-061-7/+10
| |
* | Ensure that Rails.env is equal to "test" by default when running tests.Piotr Sarnacki2012-05-061-0/+2
| | | | | | | | | | Rails.env when running tests on localhost differs from travis ci which makes it harder to write tests that check env related things.
* | Merge pull request #5910 from route/rails-dbconsoleJeremy Kemper2012-05-063-40/+86
|\ \ | | | | | | Fast path starts the database console without loading the full Rails env
| * | More faster rails dbconsoleDmitry Vorotilin2012-05-063-40/+86
| | |
* | | Remove obsolete deep_dup requiresPiotr Sarnacki2012-05-061-2/+0
| | |