aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-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 valuesPrem Sichanugrist2013-11-111-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-assetsArun Agrawal2013-11-231-0/+6
| |
* | Added test when task generator called on revokeArun Agrawal2013-11-231-1/+13
| |
* | Merge pull request #13011 from arunagw/jruby-fixesYves Senn2013-11-231-2/+10
|\ \ | | | | | | Using activerecord-jdbcsqlite3-adapter
| * | Using activerecord-jdbcsqlite3-adapterArun Agrawal2013-11-231-2/+10
| | | | | | | | | | | | | | | PluginGeneratorTest needs to have activerecord-jdbcsqlite3-adapter to pass under JRuby
* | | Cleaned up app generator testArun Agrawal2013-11-231-21/+6
|/ /
* | Use a more generic assertion to make sure this tests will be useful.Rafael Mendonça França2013-11-221-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 Caetano2013-11-221-1/+1
| | | | | | | | | | We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present.
* | Improve changelogsCarlos Antonio da Silva2013-11-221-1/+2
| | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | Build fix for new routing inspector changesArun Agrawal2013-11-221-2/+2
| | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | Remove turbolinks when generating a new application based on a templateLauro Caetano2013-11-214-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_titleRafael Mendonça França2013-11-212-1/+3
|\ \ | | | | | | Fix for titles of info pages
| * | Fix for titles of info pagesSıtkı Bağdat2013-11-222-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-routesYves Senn2013-11-211-2/+2
|\| | | | | | | | Fix for routes task
| * | Fix for routes taskSıtkı Bağdat2013-11-211-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/issue12885Carlos Antonio da Silva2013-11-211-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 willPrathamesh Sonpatki2013-11-201-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 whitespaceDmitriy Budnik2013-11-214-9/+9
|/ /
* | [ci skip] `apropriate` => `appropriate`, spaces addedAkshay Vishnoi2013-11-191-19/+19
| |
* | Merge pull request #12924 from kuldeepaggarwal/f-specsYves Senn2013-11-181-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 extensionKuldeep Aggarwal2013-11-171-1/+3
| | |
* | | [ci skip]updated documentation: added sass and less extensionsKuldeep Aggarwal2013-11-171-1/+1
|/ /
* | Build fix for ruby 1.9.3 syntaxArun Agrawal2013-11-161-1/+1
| |
* | Instrument each load config initializerPaul Nikitochkin2013-11-163-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 arrayAkshay Vishnoi2013-11-171-1/+1
| |
* | Revert "Used Yield instead of block.call" -- this causes all of ↵David Heinemeier Hansson2013-11-141-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_upsRafael Mendonça França2013-11-141-2/+2
|\ \ | | | | | | Used Yield instead of block.call
| * | Used Yield instead of block.callKuldeep Aggarwal2013-11-151-2/+2
| | |
* | | Merge pull request #12695 from mikepack/allow_pathnamesYves Senn2013-11-113-1/+19
|\ \ \ | | | | | | | | Allow Pathnames to be added to eager load paths
| * | | Allow Pathnames to be added to eager load pathsMike Pack2013-11-113-1/+19
| | | |
* | | | Make static error pages responsiveEtienne Lemay2013-11-114-33/+54
|/ / /
* | | Fix missing line and shadow on static error pages [ci skip]Dmitry Korotkov2013-11-114-0/+10
| | |
* | | Update tzinfo dependency to ~> 1.1Erik Michaels-Ober2013-11-101-0/+5
|/ / | | | | | | Include the tzinfo-data in the generated Gemfile on Windows.
* | Require the top file and autoload Base classRafael Mendonça França2013-11-093-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-requireRafael Mendonça França2013-11-081-2/+0
|\ \ | | | | | | Removed unused require
| * | Removed unused requireArun Agrawal2013-11-081-2/+0
| | |
* | | Extract common database defaults; better use of YAMLBenjamin Fleischer2013-11-0811-145/+85
|/ /
* | Added platform dependent gemsArun Agrawal2013-11-072-0/+16
| | | | | | | | | | | | See #12475 If people are on rbx they will get the desired gem
* | Fixed plugin_generator testArun Agrawal2013-11-071-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
* AestheticsRafael Mendonça França2013-11-071-13/+13
|
* Merge pull request #12787 from notalex/extract_methodRafael Mendonça França2013-11-071-23/+34
|\ | | | | Extract method refactoring for Rails::Server#start
| * Move interrupt information to print_boot_information methodAlex Johnson2013-11-071-4/+1
| |
| * Extract method refactoring for Rails::Server#startAlex Johnson2013-11-071-24/+38
| |
* | only ask for these ivars if the target responds to themAaron Patterson2013-11-061-3/+3
|/
* Merge pull request #12752 from notalex/expand_path_refactoringYves Senn2013-11-052-2/+2
|\ | | | | Refactor File.expand_path usage to remove additional File.join
| * Refactor File.expand_path usage to remove additional File.joinAlex Johnson2013-11-052-2/+2
| |
* | oops, template replay needs to happen after bundle. :orz:Aaron Patterson2013-11-041-1/+1
| |
* | application template respects Gemfile entriesAaron Patterson2013-11-042-0/+25
| |
* | gems can be added or skipped from the templateAaron Patterson2013-11-044-2/+92
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-17 13:51:54 +0000