mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,043 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

4385 Commits

Author SHA1 Message Date
Guillermo Iguaran 2e296c8ee5 Merge pull request #12365 from jbaudanza/reorder 
Move Rack::Cache after ActionDispatch::Static in the middleware stack
 2013-12-01 22:42:26 -08:00
Prathamesh Sonpatki 4816fdd385 Use .railsrc while creating new plugin if available 
- Fixes #10700
 2013-12-01 20:47:15 +05:30
Guillermo Iguaran d30cf963eb config.assets.enabled isn't used anymore to disable Rails asset pipeline 2013-12-01 02:18:35 -05:00
Guillermo Iguaran e898baa553 Honor to RAILS_GROUPS env variable while loading gems with Bundler 2013-12-01 02:12:25 -05:00
Christophe Maximin 9c7eb40858 Fix URL to robots.txt documentation 2013-11-29 10:56:30 -04:00
Xavier Noria 17c29a0df0 Merge remote-tracking branch 'docrails/master' 
Conflicts:
	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
	activesupport/lib/active_support/core_ext/hash/keys.rb
 2013-11-24 20:00:24 +01:00
Lauro Caetano c09ef94a49 Remove turbolinks when generating a new application based on a template 
that skips it.

It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template.
 2013-11-21 23:31:57 -02:00
Rafael Mendonça França 47229208fc Merge pull request #12994 from sbagdat/fix_for_info_title 
Fix for titles of info pages
 2013-11-21 17:27:24 -08:00
Sıtkı Bağdat cf863f466e Fix for titles of info pages 
Both `rails/info/properties` and `rails/info/routes` have same html
title attribute as *Routes*. This commit includes a fix for the titles.
 2013-11-22 03:02:57 +02:00
Carlos Antonio da Silva 68aebd4895 Merge pull request #12970 from prathamesh-sonpatki/issue12885 
Add positional information to eval call so that this information will be used in printing correct location where the exception occurred.

Closes #12885.
 2013-11-21 04:10:16 -08:00
Dmitriy Budnik f1ffedb233 replace U+00A0 with whitespace 2013-11-21 13:25:16 +02:00
Prathamesh Sonpatki 26f8fb8641 Add positional information to eval call so that this information will 
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
 2013-11-20 22:48:08 +05:30
Akshay Vishnoi 5190f3a05c [ci skip] `apropriate` => `appropriate`, spaces added 2013-11-19 18:09:42 +05:30
Kuldeep Aggarwal 4e7d7fc863 [ci skip]updated documentation: added sass and less extensions 2013-11-17 08:14:13 +05:30
Paul Nikitochkin 251923c7a8 Instrument each load config initializer 
In order to simplify profiling loading of initializers,
added instument for tracking load config initializer event from
`config/initializers`
 2013-11-16 21:47:08 +02:00
Akshay Vishnoi 7865805636 avoiding iterations and calling of underscore on all elements of array 2013-11-17 00:58:37 +05:30
David Heinemeier Hansson 07996ebc50 Revert "Used Yield instead of block.call" -- this causes all of atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". 
This reverts commit d3a1ce1cdc.
 2013-11-14 15:31:27 -08:00
Rafael Mendonça França 84961dc5df Merge pull request #12889 from kuldeepaggarwal/speed_ups 
Used Yield instead of block.call
 2013-11-14 11:29:28 -08:00
Kuldeep Aggarwal d3a1ce1cdc Used Yield instead of block.call 2013-11-15 00:53:57 +05:30
Yves Senn 98991a9839 Merge pull request #12695 from mikepack/allow_pathnames 
Allow Pathnames to be added to eager load paths
 2013-11-11 23:36:02 -08:00
Prem Sichanugrist efff6c1fd4 Change syntax format for example returned values 
According to our guideline, we leave 1 space between `#` and `=>`, so we
want `# =>` instead of `#=>`.

Thanks to @fxn for the suggestion.

[ci skip]
 2013-11-11 13:53:54 -05:00
Etienne Lemay 7166507eae Make static error pages responsive 2013-11-11 13:40:10 -05:00
Mike Pack ec3134739c Allow Pathnames to be added to eager load paths 2013-11-11 11:36:44 -07:00
Dmitry Korotkov bc010e7140 Fix missing line and shadow on static error pages [ci skip] 2013-11-11 11:17:44 +04:00
Erik Michaels-Ober 9d664b18df Update tzinfo dependency to ~> 1.1 
Include the tzinfo-data in the generated Gemfile on Windows.
 2013-11-10 06:52:16 -05:00
Rafael Mendonça França 4f00612287 Require the top file and autoload Base class 
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
 2013-11-09 17:55:56 -02:00
Rafael Mendonça França dc5070e78a Merge pull request #12803 from arunagw/remove-unused-require 
Removed unused require
 2013-11-08 07:49:04 -08:00
Benjamin Fleischer 124216ada8 Extract common database defaults; better use of YAML 2013-11-08 06:59:28 -06:00
Arun Agrawal 01250308e1 Removed unused require 2013-11-08 08:36:19 +01:00
Arun Agrawal e259afe847 Added platform dependent gems 
See #12475

If people are on rbx they will get the desired gem
 2013-11-07 21:32:46 +01:00
Arun Agrawal fefa8ae9a1 Fixed plugin_generator test 
Template replay needs to happen after bundle.

As we are doing TemplateRecording in apply_rails_template.

here are few commits for changes

8beb42cfbc
9104702be6
 2013-11-07 19:58:36 +01:00
Rafael Mendonça França 0fca7d67d4 Aesthetics 2013-11-07 12:15:11 -02:00
Rafael Mendonça França 99da3fc098 Merge pull request #12787 from notalex/extract_method 
Extract method refactoring for Rails::Server#start
 2013-11-07 05:58:09 -08:00
Aaron Patterson 656d412546 only ask for these ivars if the target responds to them 2013-11-06 20:34:04 -08:00
Alex Johnson 1410d46b30 Move interrupt information to print_boot_information method 2013-11-07 03:50:23 +05:30
Alex Johnson 919fafa54b Extract method refactoring for Rails::Server#start 2013-11-07 02:52:10 +05:30
Yves Senn 7d17b1dedb Merge pull request #12752 from notalex/expand_path_refactoring 
Refactor File.expand_path usage to remove additional File.join
 2013-11-05 01:35:28 -08:00
Alex Johnson 01ef2c1943 Refactor File.expand_path usage to remove additional File.join 2013-11-05 10:50:03 +05:30
Aaron Patterson 9104702be6 oops, template replay needs to happen after bundle. :orz: 2013-11-04 15:13:15 -08:00
Aaron Patterson 7eb586f57f application template respects Gemfile entries 2013-11-04 15:00:29 -08:00
Aaron Patterson 8beb42cfbc gems can be added or skipped from the template 2013-11-04 15:00:29 -08:00
Colin Bartlett 87205c3ca4 Remove extra whitespace 
When generating an app with --skip_active_record, an extra
line of whitespace was included unnecessarily.
 2013-11-04 10:06:58 -05:00
Yves Senn 84eac5dab8 BACKTRACE environment variable to show unfiltered backtraces. 
We used to support the `BACKTRACE` environment variable but when
we switched to MiniTest it got removed: f9382cd794

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 ...`
 2013-11-04 10:00:44 +01:00
Arun Agrawal fae08dd9ca No web-console for now 2013-11-03 22:19:17 +01:00
Rafael Mendonça França 9616a7ee1a Merge pull request #12733 from robin850/fix-railties-build 
Fix railties build
 2013-11-01 08:23:06 -07:00
Rafael Mendonça França fe64edec3d Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunk 
More Warnings removed for ruby trunk
 2013-11-01 08:10:48 -07:00
Rafael Mendonça França 09ce1df7aa 💣 2013-11-01 11:59:47 -02:00
Rafael Mendonça França fe21c8589f Use consistent order of the arguments 2013-11-01 11:58:40 -02:00
Robin Dupret 1a566c87cb Set the destination_root for plugins 
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)
 2013-11-01 14:40:29 +01:00
Arun Agrawal dbdb25463c shadowing variable warning removed 2013-11-01 13:47:23 +01:00