Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Rename not Ruby files to .tt" | Santiago Pastorino | 2013-12-10 | 16 | -0/+0 |
| | | | | | | This reverts commit bd360ad3c1d59273bf96ea01b17cf04285816dc2. Reverting this for now until we fix the Thor related issue | ||||
* | Rename not Ruby files to .tt | Santiago Pastorino | 2013-12-10 | 16 | -0/+0 |
| | |||||
* | Skipping debugger from plugin Gemfile for JRuby | Arun Agrawal | 2013-12-06 | 2 | -0/+13 |
| | |||||
* | Merge branch 'av-loading-order' | Rafael Mendonça França | 2013-12-05 | 1 | -4/+18 |
|\ | |||||
| * | Assert the singleton instead of to truthy/falsy | Rafael Mendonça França | 2013-12-05 | 1 | -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 View | Rafael Mendonça França | 2013-12-05 | 1 | -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 only | Arun Agrawal | 2013-12-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #13189 from strzalek/retain-ap-av-dep | Jeremy Kemper | 2013-12-05 | 1 | -2/+0 |
|\ | | | | | Retain ActionPack dependency on ActionView. Fixes #12979. | ||||
| * | Remove missing integration points of AV extraction | Carlos Antonio da Silva | 2013-12-05 | 1 | -2/+0 |
| | | |||||
* | | set `i18n.enforce_available_locales` before `i18n.default_locale`. | Yves Senn | 2013-12-05 | 1 | -0/+11 |
| | | |||||
* | | end sentences with a `.`. [ci skip] | Yves Senn | 2013-12-05 | 1 | -2/+2 |
| | | |||||
* | | Make salt argument required for message verifier | Rafael Mendonça França | 2013-12-04 | 3 | -13/+13 |
| | | |||||
* | | Fix typos | Rafael Mendonça França | 2013-12-04 | 2 | -3/+3 |
| | | |||||
* | | Test if two different verifiers don't share the same secret | Rafael Mendonça França | 2013-12-04 | 1 | -2/+12 |
| | | |||||
* | | Don't need to use a controller to test the verifier | Rafael Mendonça França | 2013-12-04 | 1 | -9/+3 |
| | | |||||
* | | No need to configure salts | Rafael Mendonça França | 2013-12-04 | 3 | -34/+7 |
| | | |||||
* | | Make possibile to get different message verifiers | Rafael Mendonça França | 2013-12-04 | 3 | -10/+37 |
| | | |||||
* | | Add missing require | Rafael Mendonça França | 2013-12-04 | 1 | -0/+1 |
| | | |||||
* | | Rename verifier to message_verifier | Rafael Mendonça França | 2013-12-04 | 3 | -10/+10 |
| | | |||||
* | | Add documentation and CHANGELOG entry to Application#verifier | Rafael Mendonça França | 2013-12-04 | 2 | -0/+21 |
| | | |||||
* | | Add application verifier | Rafael Mendonça França | 2013-12-04 | 2 | -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 applications | Jon Leighton | 2013-12-03 | 5 | -7/+71 |
|/ | |||||
* | Merge pull request #13117 from akshay-vishnoi/typo | Xavier Noria | 2013-12-02 | 1 | -2/+2 |
|\ | | | | | Typo and grammatical fixes [ci skip] | ||||
| * | Typo and grammatical fixes [ci skip] | Akshay Vishnoi | 2013-12-02 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #12365 from jbaudanza/reorder | Guillermo Iguaran | 2013-12-01 | 2 | -6/+6 |
|\ \ | | | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack | ||||
| * | | Move Rack::Cache after AD::Static in the stack | Jonathan Baudanza | 2013-09-25 | 2 | -6/+6 |
| | | | |||||
* | | | Use .railsrc while creating new plugin if available | Prathamesh Sonpatki | 2013-12-01 | 2 | -0/+19 |
| | | | | | | | | | | | | - Fixes #10700 | ||||
* | | | config.assets.enabled isn't used anymore to disable Rails asset pipeline | Guillermo Iguaran | 2013-12-01 | 2 | -6/+0 |
| | | | |||||
* | | | Honor to RAILS_GROUPS env variable while loading gems with Bundler | Guillermo Iguaran | 2013-12-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #13111 from akshay-vishnoi/typo | Carlos Antonio da Silva | 2013-11-30 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | Typo fixes [ci skip] | ||||
| * | | Typo fixes [ci skip] | Akshay Vishnoi | 2013-11-30 | 1 | -1/+1 |
| | | | |||||
* | | | Fixes failing test for JRuby | Arun Agrawal | 2013-11-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | in JRuby FileUtils do not change current dir when moving files | ||||
* | | | Merge pull request #13104 from christophemaximin/fix_robots_txt_link | Yves Senn | 2013-11-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix URL to robots.txt documentation [ci skip] | ||||
| * | | | 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 |