Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Make method name consistent with existing methods | Andrew White | 2012-06-06 | 2 | -4/+4 | |
| | | | ||||||
* | | | Fixed the application_controller require_dependency path generated by the ↵ | Fred Wu | 2012-06-06 | 3 | -6/+9 | |
| | | | | | | | | | | | | app generator | |||||
* | | | Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assert | José Valim | 2012-06-05 | 1 | -17/+24 | |
|\ \ \ | | | | | | | | | bundle exec rake assets:precompile shouldn't fail quietly. | |||||
| * | | | bundle exec rake assets:precompile shouldn't fail quietly. | John Yani | 2012-06-05 | 1 | -17/+24 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | If JavaScript runtime is not installed, execjs fails with error quietly, while tests continue to run. This should not happen since it causes tests to fail for unknown reason (#6621). This commit assures that if JavaScript runtime is not installed, an assertion is raised. | |||||
* / / | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' command | Fred Wu | 2012-06-05 | 2 | -0/+41 | |
|/ / | ||||||
* | | remove unneeded blank line from !namespeced? controller generators | Akira Matsuda | 2012-06-01 | 2 | -2/+2 | |
| | | ||||||
* | | Revert "Only include Rake::DSL if it's defined." | Akira Matsuda | 2012-06-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9 | |||||
* | | Rake::DSL should always be available | Jeremy Kemper | 2012-05-31 | 1 | -1/+1 | |
| | | ||||||
* | | Explicitly require rake so its DSL is available | Jeremy Kemper | 2012-05-31 | 1 | -0/+1 | |
| | | ||||||
* | | Add code statistics for Javascript and | Arun Agrawal | 2012-05-31 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | CoffeeScript files to `rake stats` task Orignal PR was #2270 Thanks to @nfm | |||||
* | | Set RACK_ENV to nil in the dbconsole test | Rafael Mendonça França | 2012-05-30 | 1 | -0/+1 | |
| | | | | | | | | This will fix the travis-ci build | |||||
* | | Fix app_generator_test with the changes introduced at | Rafael Mendonça França | 2012-05-30 | 1 | -1/+1 | |
| | | | | | | | | f4d7af67ffc90f2542afa50c7579fc83ea4f45f2 | |||||
* | | Changed symbol platform to platforms for the commented out call to gem ↵ | Martin O'Connor | 2012-05-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms. | |||||
* | | Remove support for rails server RAILS_ENV=env-name | Sam Oliver | 2012-05-30 | 2 | -7/+2 | |
| | | ||||||
* | | Fix various bugs with console arguments. | Sam Oliver | 2012-05-30 | 5 | -125/+180 | |
|/ | | | | Allow hyphens in environment names again. | |||||
* | remove unused route reloading code | schneems | 2012-05-30 | 1 | -2/+0 | |
| | | | Since the environment is initialized each time rake is run, routes don't need to be re-loaded. https://github.com/rails/rails/pull/6461#r869953 | |||||
* | Add a changelog entry about runner hook. | kennyj | 2012-05-31 | 1 | -0/+2 | |
| | ||||||
* | Unused variable warning removed. | Arun Agrawal | 2012-05-30 | 1 | -1/+1 | |
| | ||||||
* | More assert_match warnings fixed. | Arun Agrawal | 2012-05-30 | 4 | -12/+12 | |
| | ||||||
* | Warnings removed for "assert_match /". | Arun Agrawal | 2012-05-30 | 1 | -20/+20 | |
| | ||||||
* | Add support runner hook. | kennyj | 2012-05-29 | 6 | -0/+53 | |
| | ||||||
* | Add a testcase for #5847. | kennyj | 2012-05-29 | 1 | -0/+23 | |
| | ||||||
* | update Gemfile template to 1.9 hash syntax | Francesco Rodriguez | 2012-05-29 | 1 | -1/+1 | |
| | ||||||
* | Fix railties_order when application object is passed | Piotr Sarnacki | 2012-05-27 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays. | |||||
* | Fixes build 4008.1 | Waseem Ahmad | 2012-05-25 | 1 | -2/+2 | |
| | | | | | | | | This fixex build 4008.1[1] because of the changes made in 4001835db00ce44cb75bca33ec02cd76b8ccc790 [1] http://travis-ci.org/#!/rails/rails/jobs/1429671 | |||||
* | Merge pull request #6481 from schneems/schneems/sextant-routes | Rafael Mendonça França | 2012-05-24 | 1 | -9/+0 | |
|\ | | | | | Remove Unnecessary Test from route_inspect_test | |||||
| * | remove unnecessary test from route_inspect_test | schneems | 2012-05-24 | 1 | -9/+0 | |
| | | ||||||
* | | do not set the ENGINE_PATH to nil | Aaron Patterson | 2012-05-24 | 1 | -1/+1 | |
| | | ||||||
* | | `name` should be public. | Aaron Patterson | 2012-05-24 | 1 | -12/+12 | |
|/ | ||||||
* | Rails::InfoController tests passing | schneems | 2012-05-24 | 3 | -6/+32 | |
| | | | | This includes new tests for /rails/info/routes | |||||
* | /rails/info/routes path shows routing information | schneems | 2012-05-24 | 7 | -8/+72 | |
| | | | | Will show similar contents to the output of `$ rake routes` in the browser in development. This speeds the time required to generate routes, since the application is already initialized. | |||||
* | Fixed backward incompatibility for engines. | Philip Arndt | 2012-05-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | - Many engines rely on being able to join directories to the Rails root: Rails.root.join('somedir') - This was now impossible because Rails.root returned a String: NoMethodError: undefined method `join' for "/code/myrailsapp":String - This was broken in 4001835db00ce44cb75bca33ec02cd76b8ccc790 | |||||
* | use File.join rather than depend on Pathname | Aaron Patterson | 2012-05-23 | 1 | -1/+1 | |
| | ||||||
* | Revert "require the constants we use. ensure that root always returns a ↵ | Aaron Patterson | 2012-05-23 | 1 | -2/+1 | |
| | | | | | | Pathname" This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6. | |||||
* | require the constants we use. ensure that root always returns a Pathname | Aaron Patterson | 2012-05-23 | 1 | -1/+2 | |
| | ||||||
* | removing more pathnameisms | Aaron Patterson | 2012-05-23 | 2 | -6/+4 | |
| | ||||||
* | use File.join to decrease dependencies on Pathname | Aaron Patterson | 2012-05-23 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-23 | 1 | -2/+1 | |
|\ | ||||||
| * | Revert "Remove blank trailing comments" | Vijay Dev | 2012-05-23 | 10 | -0/+23 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip] | |||||
| * | Remove obsolete comment from generator gem method | Alexey Vakhov | 2012-05-22 | 1 | -2/+1 | |
| | | | | | | | | | | This comment about :env option for gem method was actual for rails 2.3 without bundler. Now bundler uses grups for this goal. | |||||
| * | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 10 | -23/+0 | |
| | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed. | |||||
* | | Add license field to gemspecs, by Matt Griffin | Matt Griffin | 2012-05-23 | 1 | -0/+1 | |
| | | ||||||
* | | Remove unnecessary comment. | Uģis Ozols | 2012-05-23 | 1 | -1/+0 | |
| | | ||||||
* | | I guess we have to return a pathname object. o_O | Aaron Patterson | 2012-05-22 | 1 | -1/+1 | |
| | | ||||||
* | | use File.realpath and avoid making Pathname objects | Aaron Patterson | 2012-05-22 | 1 | -2/+1 | |
| | | ||||||
* | | use RUBY_PLATFORM in case of cross compiled ruby | Aaron Patterson | 2012-05-22 | 1 | -1/+1 | |
| | | ||||||
* | | initialize instance variables | Aaron Patterson | 2012-05-22 | 1 | -2/+6 | |
| | | ||||||
* | | initialize our instance variables | Aaron Patterson | 2012-05-22 | 1 | -2/+14 | |
| | | ||||||
* | | Move root method at TOP of routes file | Gaurish Sharma | 2012-05-22 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | Made the change as per the following text in routing guide:- "You should put the root route at the top of the file, because it is the most popular route and should be matched first." However, if root is best left at bottom. We will change to fix that text | |||||
* | | Use new hash syntax for generators gem method | Alexey Vakhov | 2012-05-22 | 4 | -4/+12 | |
| | | | | | | | | | | | | 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. |