Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix URL to robots.txt documentation | Christophe Maximin | 2013-11-29 | 1 | -1/+1 | |
| |/ / | ||||||
* / / | Checking no debugger on JRuby | Arun Agrawal | 2013-11-29 | 1 | -1/+7 | |
|/ / | | | | | | | fixes tests for JRuby | |||||
* | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-11-24 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb | |||||
| * | | Change syntax format for example returned values | Prem Sichanugrist | 2013-11-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip] | |||||
* | | | Test for when controller with skip-assets | Arun Agrawal | 2013-11-23 | 1 | -0/+6 | |
| | | | ||||||
* | | | Added test when task generator called on revoke | Arun Agrawal | 2013-11-23 | 1 | -1/+13 | |
| | | | ||||||
* | | | Merge pull request #13011 from arunagw/jruby-fixes | Yves Senn | 2013-11-23 | 1 | -2/+10 | |
|\ \ \ | | | | | | | | | Using activerecord-jdbcsqlite3-adapter | |||||
| * | | | Using activerecord-jdbcsqlite3-adapter | Arun Agrawal | 2013-11-23 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | PluginGeneratorTest needs to have activerecord-jdbcsqlite3-adapter to pass under JRuby | |||||
* | | | | Cleaned up app generator test | Arun Agrawal | 2013-11-23 | 1 | -21/+6 | |
|/ / / | ||||||
* | | | Use a more generic assertion to make sure this tests will be useful. | Rafael Mendonça França | 2013-11-22 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | Since we are using assert_no_match, if we change the code before changing the tests, the tests will still pass and the assertion will become useless | |||||
* | | | Fix the assertion for not inclusion of turbolinks on application.js. | Lauro Caetano | 2013-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present. | |||||
* | | | Improve changelogs | Carlos Antonio da Silva | 2013-11-22 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip] | |||||
* | | | Build fix for new routing inspector changes | Arun Agrawal | 2013-11-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e | |||||
* | | | Remove turbolinks when generating a new application based on a template | Lauro Caetano | 2013-11-21 | 4 | -4/+21 | |
| | | | | | | | | | | | | | | | | | | that skips it. It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template. | |||||
* | | | Merge pull request #12994 from sbagdat/fix_for_info_title | Rafael Mendonça França | 2013-11-21 | 2 | -1/+3 | |
|\ \ \ | | | | | | | | | Fix for titles of info pages | |||||
| * | | | Fix for titles of info pages | Sıtkı Bağdat | 2013-11-22 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | Both `rails/info/properties` and `rails/info/routes` have same html title attribute as *Routes*. This commit includes a fix for the titles. | |||||
* | | | | Merge pull request #12975 from sbagdat/fix-for-rake-routes | Yves Senn | 2013-11-21 | 1 | -2/+2 | |
|\| | | | | | | | | | | | Fix for routes task | |||||
| * | | | Fix for routes task | Sıtkı Bağdat | 2013-11-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | This commit fixes formatting issue for `rake routes` task, when a section is shorter than a header. | |||||
* | | | | Merge pull request #12970 from prathamesh-sonpatki/issue12885 | Carlos Antonio da Silva | 2013-11-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add positional information to eval call so that this information will be used in printing correct location where the exception occurred. Closes #12885. | |||||
| * | | | | Add positional information to eval call so that this information will | Prathamesh Sonpatki | 2013-11-20 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* / / / | replace U+00A0 with whitespace | Dmitriy Budnik | 2013-11-21 | 4 | -9/+9 | |
|/ / / | ||||||
* | | | [ci skip] `apropriate` => `appropriate`, spaces added | Akshay Vishnoi | 2013-11-19 | 1 | -19/+19 | |
| | | | ||||||
* | | | Merge pull request #12924 from kuldeepaggarwal/f-specs | Yves Senn | 2013-11-18 | 1 | -1/+3 | |
|\ \ \ | | | | | | | | | added test cases to find notes in a file with .builder extension | |||||
| * | | | added test cases to find notes in a file with .builder extension | Kuldeep Aggarwal | 2013-11-17 | 1 | -1/+3 | |
| | | | | ||||||
* | | | | [ci skip]updated documentation: added sass and less extensions | Kuldeep Aggarwal | 2013-11-17 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Build fix for ruby 1.9.3 syntax | Arun Agrawal | 2013-11-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Instrument each load config initializer | Paul Nikitochkin | 2013-11-16 | 3 | -1/+50 | |
| | | | | | | | | | | | | | | | | | | In order to simplify profiling loading of initializers, added instument for tracking load config initializer event from `config/initializers` | |||||
* | | | avoiding iterations and calling of underscore on all elements of array | Akshay Vishnoi | 2013-11-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "Used Yield instead of block.call" -- this causes all of ↵ | David Heinemeier Hansson | 2013-11-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd. | |||||
* | | | Merge pull request #12889 from kuldeepaggarwal/speed_ups | Rafael Mendonça França | 2013-11-14 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Used Yield instead of block.call | |||||
| * | | | Used Yield instead of block.call | Kuldeep Aggarwal | 2013-11-15 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #12695 from mikepack/allow_pathnames | Yves Senn | 2013-11-11 | 3 | -1/+19 | |
|\ \ \ \ | | | | | | | | | | | Allow Pathnames to be added to eager load paths | |||||
| * | | | | Allow Pathnames to be added to eager load paths | Mike Pack | 2013-11-11 | 3 | -1/+19 | |
| | | | | | ||||||
* | | | | | Make static error pages responsive | Etienne Lemay | 2013-11-11 | 4 | -33/+54 | |
|/ / / / | ||||||
* | | | | Fix missing line and shadow on static error pages [ci skip] | Dmitry Korotkov | 2013-11-11 | 4 | -0/+10 | |
| | | | | ||||||
* | | | | Update tzinfo dependency to ~> 1.1 | Erik Michaels-Ober | 2013-11-10 | 1 | -0/+5 | |
|/ / / | | | | | | | | | | Include the tzinfo-data in the generated Gemfile on Windows. | |||||
* | | | Require the top file and autoload Base class | Rafael Mendonça França | 2013-11-09 | 3 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Merge pull request #12803 from arunagw/remove-unused-require | Rafael Mendonça França | 2013-11-08 | 1 | -2/+0 | |
|\ \ \ | | | | | | | | | Removed unused require | |||||
| * | | | Removed unused require | Arun Agrawal | 2013-11-08 | 1 | -2/+0 | |
| | | | | ||||||
* | | | | Extract common database defaults; better use of YAML | Benjamin Fleischer | 2013-11-08 | 11 | -145/+85 | |
|/ / / | ||||||
* | | | Added platform dependent gems | Arun Agrawal | 2013-11-07 | 2 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | See #12475 If people are on rbx they will get the desired gem | |||||
* | | | Fixed plugin_generator test | Arun Agrawal | 2013-11-07 | 1 | -1/+4 | |
|/ / | | | | | | | | | | | | | | | | | | | Template replay needs to happen after bundle. As we are doing TemplateRecording in apply_rails_template. here are few commits for changes 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356 9104702be61253f9448ca070a22fc86bb4299555 | |||||
* | | Aesthetics | Rafael Mendonça França | 2013-11-07 | 1 | -13/+13 | |
| | | ||||||
* | | Merge pull request #12787 from notalex/extract_method | Rafael Mendonça França | 2013-11-07 | 1 | -23/+34 | |
|\ \ | | | | | | | Extract method refactoring for Rails::Server#start | |||||
| * | | Move interrupt information to print_boot_information method | Alex Johnson | 2013-11-07 | 1 | -4/+1 | |
| | | | ||||||
| * | | Extract method refactoring for Rails::Server#start | Alex Johnson | 2013-11-07 | 1 | -24/+38 | |
| | | | ||||||
* | | | only ask for these ivars if the target responds to them | Aaron Patterson | 2013-11-06 | 1 | -3/+3 | |
|/ / | ||||||
* | | Merge pull request #12752 from notalex/expand_path_refactoring | Yves Senn | 2013-11-05 | 2 | -2/+2 | |
|\ \ | | | | | | | Refactor File.expand_path usage to remove additional File.join | |||||
| * | | Refactor File.expand_path usage to remove additional File.join | Alex Johnson | 2013-11-05 | 2 | -2/+2 | |
| | | | ||||||
* | | | oops, template replay needs to happen after bundle. :orz: | Aaron Patterson | 2013-11-04 | 1 | -1/+1 | |
| | | |