aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Rename not Ruby files to .tt"Santiago Pastorino2013-12-1016-0/+0
| | | | | | This reverts commit bd360ad3c1d59273bf96ea01b17cf04285816dc2. Reverting this for now until we fix the Thor related issue
* Rename not Ruby files to .ttSantiago Pastorino2013-12-1016-0/+0
|
* Skipping debugger from plugin Gemfile for JRubyArun Agrawal2013-12-062-0/+13
|
* Merge branch 'av-loading-order'Rafael Mendonça França2013-12-051-4/+18
|\
| * Assert the singleton instead of to truthy/falsyRafael Mendonça França2013-12-051-4/+4
| | | | | | | | | | This will avoid false positives where caching? is nil and should be false
| * Add tests to cache_template_loading when an engine loaded Action ViewRafael Mendonça França2013-12-051-0/+14
| | | | | | | | | | | | | | | | before the application This test is a regression test to b068e20b35797aa6deaa377a48c990759734f515 that changed the load order of Action View initializers.
* | Make sure that spring is loaded in development onlyArun Agrawal2013-12-051-1/+1
|/
* Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-051-2/+0
|\ | | | | Retain ActionPack dependency on ActionView. Fixes #12979.
| * Remove missing integration points of AV extractionCarlos Antonio da Silva2013-12-051-2/+0
| |
* | set `i18n.enforce_available_locales` before `i18n.default_locale`.Yves Senn2013-12-051-0/+11
| |
* | end sentences with a `.`. [ci skip]Yves Senn2013-12-051-2/+2
| |
* | Make salt argument required for message verifierRafael Mendonça França2013-12-043-13/+13
| |
* | Fix typosRafael Mendonça França2013-12-042-3/+3
| |
* | Test if two different verifiers don't share the same secretRafael Mendonça França2013-12-041-2/+12
| |
* | Don't need to use a controller to test the verifierRafael Mendonça França2013-12-041-9/+3
| |
* | No need to configure saltsRafael Mendonça França2013-12-043-34/+7
| |
* | Make possibile to get different message verifiersRafael Mendonça França2013-12-043-10/+37
| |
* | Add missing requireRafael Mendonça França2013-12-041-0/+1
| |
* | Rename verifier to message_verifierRafael Mendonça França2013-12-043-10/+10
| |
* | Add documentation and CHANGELOG entry to Application#verifierRafael Mendonça França2013-12-042-0/+21
| |
* | Add application verifierRafael Mendonça França2013-12-042-0/+53
| | | | | | | | | | | | | | | | It is an application global verifier that can be used to generate and verify signed messages. See the documentation of ActiveSupport::MessageVerifier for more information.
* | Install Spring preloader when generating new applicationsJon Leighton2013-12-035-7/+71
|/
* Merge pull request #13117 from akshay-vishnoi/typoXavier Noria2013-12-021-2/+2
|\ | | | | Typo and grammatical fixes [ci skip]
| * Typo and grammatical fixes [ci skip]Akshay Vishnoi2013-12-021-2/+2
| |
* | Merge pull request #12365 from jbaudanza/reorderGuillermo Iguaran2013-12-012-6/+6
|\ \ | | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack
| * | Move Rack::Cache after AD::Static in the stackJonathan Baudanza2013-09-252-6/+6
| | |
* | | Use .railsrc while creating new plugin if availablePrathamesh Sonpatki2013-12-012-0/+19
| | | | | | | | | | | | - Fixes #10700
* | | config.assets.enabled isn't used anymore to disable Rails asset pipelineGuillermo Iguaran2013-12-012-6/+0
| | |
* | | Honor to RAILS_GROUPS env variable while loading gems with BundlerGuillermo Iguaran2013-12-011-1/+1
| | |
* | | Merge pull request #13111 from akshay-vishnoi/typoCarlos Antonio da Silva2013-11-301-1/+1
|\ \ \ | | |/ | |/| Typo fixes [ci skip]
| * | Typo fixes [ci skip]Akshay Vishnoi2013-11-301-1/+1
| | |
* | | Fixes failing test for JRubyArun Agrawal2013-11-291-0/+3
| | | | | | | | | | | | | | | in JRuby FileUtils do not change current dir when moving files
* | | Merge pull request #13104 from christophemaximin/fix_robots_txt_linkYves Senn2013-11-291-1/+1
|\ \ \ | | | | | | | | Fix URL to robots.txt documentation [ci skip]
| * | | Fix URL to robots.txt documentationChristophe Maximin2013-11-291-1/+1
| |/ /
* / / Checking no debugger on JRubyArun Agrawal2013-11-291-1/+7
|/ / | | | | | | fixes tests for JRuby
* | 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